Update to Chromium version 75.0.3749.0 (#645082)

This commit is contained in:
Daniel Nitsche
2019-04-16 14:38:48 +00:00
committed by Marshall Greenblatt
parent 1beec23065
commit 879911b721
79 changed files with 620 additions and 563 deletions

View File

@@ -1,8 +1,8 @@
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
index 46ae0545c0a9..c6f193b7c6dd 100644
index 0fbc2149df74..14f5bbb2579c 100644
--- services/service_manager/embedder/main.cc
+++ services/service_manager/embedder/main.cc
@@ -244,22 +244,36 @@ int RunService(MainDelegate* delegate) {
@@ -233,22 +233,36 @@ int RunService(MainDelegate* delegate) {
return 0;
}
@@ -43,7 +43,7 @@ index 46ae0545c0a9..c6f193b7c6dd 100644
// A flag to indicate whether Main() has been called before. On Android, we
// may re-run Main() without restarting the browser process. This flag
@@ -335,12 +349,7 @@ int Main(const MainParams& params) {
@@ -334,12 +348,7 @@ int Main(const MainParams& params) {
MainDelegate::InitializeParams init_params;
#if defined(OS_MACOSX)
@@ -57,7 +57,7 @@ index 46ae0545c0a9..c6f193b7c6dd 100644
InitializeMac();
#endif
@@ -384,18 +393,16 @@ int Main(const MainParams& params) {
@@ -383,18 +392,16 @@ int Main(const MainParams& params) {
}
}
@@ -85,7 +85,7 @@ index 46ae0545c0a9..c6f193b7c6dd 100644
switch (process_type) {
case ProcessType::kDefault:
NOTREACHED();
@@ -417,6 +424,8 @@ int Main(const MainParams& params) {
@@ -416,6 +423,8 @@ int Main(const MainParams& params) {
break;
}
@@ -94,7 +94,7 @@ index 46ae0545c0a9..c6f193b7c6dd 100644
if (tracker) {
if (exit_code == 0) {
tracker->SetProcessPhaseIfEnabled(
@@ -428,13 +437,38 @@ int Main(const MainParams& params) {
@@ -427,13 +436,38 @@ int Main(const MainParams& params) {
}
}