Update to Chromium version 57.0.2987.21

This commit is contained in:
Marshall Greenblatt
2017-02-03 14:39:19 -05:00
parent 968dfaab73
commit ae07baa5e1
14 changed files with 41 additions and 41 deletions

View File

@@ -429,7 +429,7 @@ index 7df66ea..4ee709a 100644
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
@@ -40,9 +43,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
@@ -40,9 +43,10 @@
if (initial_client) {
@autoreleasepool {
@@ -443,7 +443,7 @@ index 7df66ea..4ee709a 100644
// Is there a way to recover if this fails?
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -54,16 +58,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
@@ -54,16 +58,27 @@
// crash server won't have symbols for any other build types.
std::string url = "https://clients2.google.com/cr/report";
#else
@@ -476,7 +476,7 @@ index 7df66ea..4ee709a 100644
#if defined(GOOGLE_CHROME_BUILD)
NSString* channel = base::mac::ObjCCast<NSString>(
@@ -73,12 +88,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
@@ -73,12 +88,16 @@
}
#endif
@@ -498,7 +498,7 @@ index 7df66ea..4ee709a 100644
std::vector<std::string> arguments;
if (!browser_process) {
@@ -90,6 +109,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
@@ -90,6 +109,12 @@
"--reset-own-crash-exception-port-to-system-default");
}