BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 16 insertions, 7 deletions

diff --git a/chromium/components/component_updater/component_installer.cc b/chromium/components/component_updater/component_installer.cc
index 33ad68b46ac..499b32aab34 100644
--- a/chromium/components/component_updater/component_installer.cc
+++ b/chromium/components/component_updater/component_installer.cc
@@ -274,10 +274,11 @@ void ComponentInstaller::StartRegistration(
   // Then check for a higher-versioned user-wide installation.
   base::FilePath latest_path;
   std::unique_ptr<base::DictionaryValue> latest_manifest;
-  base::FilePath base_dir;
-  if (!PathService::Get(DIR_COMPONENT_USER, &base_dir))
+  base::FilePath base_component_dir;
+  if (!PathService::Get(DIR_COMPONENT_USER, &base_component_dir))
     return;
-  base_dir = base_dir.Append(installer_policy_->GetRelativeInstallDir());
+  base::FilePath base_dir =
+      base_component_dir.Append(installer_policy_->GetRelativeInstallDir());
   if (!base::PathExists(base_dir) && !base::CreateDirectory(base_dir)) {
     PLOG(ERROR) << "Could not create the base directory for "
                 << installer_policy_->GetName() << " ("
@@ -286,9 +287,15 @@ void ComponentInstaller::StartRegistration(
   }
 
 #if defined(OS_CHROMEOS)
-  if (!base::SetPosixFilePermissions(base_dir, 0755)) {
-    PLOG(ERROR) << "SetPosixFilePermissions failed: " << base_dir.value();
-    return;
+  base::FilePath base_dir_ = base_component_dir;
+  std::vector<base::FilePath::StringType> components;
+  installer_policy_->GetRelativeInstallDir().GetComponents(&components);
+  for (const base::FilePath::StringType component : components) {
+    base_dir_ = base_dir_.Append(component);
+    if (!base::SetPosixFilePermissions(base_dir_, 0755)) {
+      PLOG(ERROR) << "SetPosixFilePermissions failed: " << base_dir.value();
+      return;
+    }
   }
 #endif  // defined(OS_CHROMEOS)
 
diff --git a/chromium/components/component_updater/component_updater_service.h b/chromium/components/component_updater/component_updater_service.h
index d965ef4c749..6ddae4a34e3 100644
--- a/chromium/components/component_updater/component_updater_service.h
+++ b/chromium/components/component_updater/component_updater_service.h
@@ -159,9 +159,11 @@ class OnDemandUpdater {
   friend class DownloadableStringsComponentInstallerPolicy;
   friend class ::ComponentsUI;
   friend class ::PluginObserver;
+  friend class SwReporterOnDemandFetcher;
 #if defined(OS_CHROMEOS)
-  friend class CrOSComponent;
+  friend class CrOSComponentManager;
 #endif  // defined(OS_CHROMEOS)
+  friend class VrAssetsComponentInstallerPolicy;
 
   // Triggers an update check for a component. |id| is a value
   // returned by GetCrxComponentID(). If an update for this component is already