Update to Chromium version 68.0.3399.0 (#551554)

libcef/common/content_client.cc

@@ -150,8 +150,8 @@ bool GetSystemPepperFlash(content::PepperPluginInfo* plugin) {
     return false;
 
   base::FilePath flash_filename;
-  if (!PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
-                        &flash_filename)) {
+  if (!base::PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+                              &flash_filename)) {
     return false;
   }
 

libcef/common/crash_reporter_client.cc

@@ -84,7 +84,7 @@ PathString GetCrashConfigPath() {
 
   if (config_path.empty()) {
     // Start with the path to the running executable.
-    if (!PathService::Get(base::DIR_EXE, &config_path))
+    if (!base::PathService::Get(base::DIR_EXE, &config_path))
       return PathString();
   }
 
@@ -637,9 +637,9 @@ bool CefCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
   if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
     base::FilePath crash_dumps_dir_path =
         base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
-    PathService::Override(chrome::DIR_CRASH_DUMPS, crash_dumps_dir_path);
+    base::PathService::Override(chrome::DIR_CRASH_DUMPS, crash_dumps_dir_path);
   }
-  return PathService::Get(chrome::DIR_CRASH_DUMPS, crash_dir);
+  return base::PathService::Get(chrome::DIR_CRASH_DUMPS, crash_dir);
 }
 
 #endif  // !defined(OS_POSIX)

libcef/common/main_delegate.cc

@@ -36,6 +36,7 @@
 #include "extensions/common/constants.h"
 #include "ipc/ipc_buildflags.h"
 #include "pdf/pdf_ppapi.h"
+#include "services/service_manager/sandbox/switches.h"
 #include "ui/base/layout.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -107,21 +108,21 @@ void OverrideChildProcessPath() {
   }
 
   // Used by ChildProcessHost::GetChildPath and PlatformCrashpadInitialization.
-  PathService::Override(content::CHILD_PROCESS_EXE, child_process_path);
+  base::PathService::Override(content::CHILD_PROCESS_EXE, child_process_path);
 }
 
 #else  // !defined(OS_MACOSX)
 
 base::FilePath GetResourcesFilePath() {
   base::FilePath pak_dir;
-  PathService::Get(base::DIR_MODULE, &pak_dir);
+  base::PathService::Get(base::DIR_MODULE, &pak_dir);
   return pak_dir;
 }
 
 // Use a "debug.log" file in the running executable's directory.
 base::FilePath GetDefaultLogFile() {
   base::FilePath log_path;
-  PathService::Get(base::DIR_EXE, &log_path);
+  base::PathService::Get(base::DIR_EXE, &log_path);
   return log_path.Append(FILE_PATH_LITERAL("debug.log"));
 }
 
@@ -168,8 +169,8 @@ void OverridePepperFlashSystemPluginPath() {
 #endif
 
   if (!plugin_filename.empty()) {
-    PathService::Override(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
-                          plugin_filename);
+    base::PathService::Override(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+                                plugin_filename);
   }
 }
 
@@ -193,7 +194,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* result) {
 
 // Based on chrome/common/chrome_paths_mac.mm.
 bool GetDefaultUserDataDirectory(base::FilePath* result) {
-  if (!PathService::Get(base::DIR_APP_DATA, result))
+  if (!base::PathService::Get(base::DIR_APP_DATA, result))
     return false;
   *result = result->Append(FILE_PATH_LITERAL("CEF"));
   *result = result->Append(FILE_PATH_LITERAL("User Data"));
@@ -204,7 +205,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* result) {
 
 // Based on chrome/common/chrome_paths_win.cc.
 bool GetDefaultUserDataDirectory(base::FilePath* result) {
-  if (!PathService::Get(base::DIR_LOCAL_APP_DATA, result))
+  if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, result))
     return false;
   *result = result->Append(FILE_PATH_LITERAL("CEF"));
   *result = result->Append(FILE_PATH_LITERAL("User Data"));
@@ -222,7 +223,7 @@ base::FilePath GetUserDataPath() {
   if (GetDefaultUserDataDirectory(&result))
     return result;
 
-  if (PathService::Get(base::DIR_TEMP, &result))
+  if (base::PathService::Get(base::DIR_TEMP, &result))
     return result;
 
   NOTREACHED();
@@ -343,7 +344,7 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
 #endif
 
     if (no_sandbox)
-      command_line->AppendSwitch(switches::kNoSandbox);
+      command_line->AppendSwitch(service_manager::switches::kNoSandbox);
 
     if (settings.user_agent.length > 0) {
       command_line->AppendSwitchASCII(switches::kUserAgent,
@@ -547,13 +548,13 @@ void CefMainDelegate::PreSandboxStartup() {
     OverridePepperFlashSystemPluginPath();
 
     const base::FilePath& user_data_path = GetUserDataPath();
-    PathService::Override(chrome::DIR_USER_DATA, user_data_path);
+    base::PathService::Override(chrome::DIR_USER_DATA, user_data_path);
 
     // Path used for crash dumps.
-    PathService::Override(chrome::DIR_CRASH_DUMPS, user_data_path);
+    base::PathService::Override(chrome::DIR_CRASH_DUMPS, user_data_path);
 
     // Path used for spell checking dictionary files.
-    PathService::OverrideAndCreateIfNeeded(
+    base::PathService::OverrideAndCreateIfNeeded(
         chrome::DIR_APP_DICTIONARIES,
         user_data_path.AppendASCII("Dictionaries"),
         false,  // May not be an absolute path.
@@ -668,7 +669,7 @@ void CefMainDelegate::InitializeResourceBundle() {
   if (resources_dir.empty())
     resources_dir = GetResourcesFilePath();
   if (!resources_dir.empty())
-    PathService::Override(chrome::DIR_RESOURCES, resources_dir);
+    base::PathService::Override(chrome::DIR_RESOURCES, resources_dir);
 
   if (!content_client_.pack_loading_disabled()) {
     if (!resources_dir.empty()) {
@@ -688,7 +689,7 @@ void CefMainDelegate::InitializeResourceBundle() {
       locales_dir = command_line->GetSwitchValuePath(switches::kLocalesDirPath);
 
     if (!locales_dir.empty())
-      PathService::Override(ui::DIR_LOCALES, locales_dir);
+      base::PathService::Override(ui::DIR_LOCALES, locales_dir);
   }
 
   std::string locale = command_line->GetSwitchValueASCII(switches::kLang);

libcef/common/util_mac.mm

@@ -63,7 +63,7 @@ base::FilePath GetFrameworkResourcesDirectory() {
 
 base::FilePath GetMainProcessPath() {
   base::FilePath path;
-  PathService::Get(base::FILE_EXE, &path);
+  base::PathService::Get(base::FILE_EXE, &path);
   DCHECK(!path.empty());
   return path;
 }

libcef/common/widevine_loader.cc

@@ -25,6 +25,7 @@
 #include "content/public/common/content_switches.h"
 #include "media/cdm/cdm_host_file.h"
 #include "media/cdm/supported_cdm_versions.h"
+#include "services/service_manager/sandbox/switches.h"
 
 namespace {
 
@@ -355,7 +356,7 @@ void CefWidevineLoader::AddContentDecryptionModules(
   // load all plugins before initializing the sandbox.
   if (command_line.GetSwitchValueASCII(switches::kProcessType) !=
           switches::kZygoteProcess ||
-      command_line.HasSwitch(switches::kNoSandbox)) {
+      command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
     return;
   }