Allow DCI to pick up contents from Internet Plug-Ins on OS X.

components/component_updater/default_component_installer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/component_updater/default_component_installer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 134 matching lines @@
 }
 
 bool DefaultComponentInstaller::Uninstall() {
   DCHECK(thread_checker_.CalledOnValidThread());
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DefaultComponentInstaller::UninstallOnTaskRunner, this));
   return true;
 }
 
-bool DefaultComponentInstaller::FindPreinstallation() {
-  base::FilePath path;
-  if (!PathService::Get(DIR_COMPONENT_PREINSTALLED, &path)) {
-    DVLOG(1) << "DIR_COMPONENT_PREINSTALLED does not exist.";
-    return false;
-  }
-
-  path = path.Append(installer_traits_->GetRelativeInstallDir());
+bool DefaultComponentInstaller::FindPreinstallation(
+    const base::FilePath& root) {
+  base::FilePath path = root.Append(installer_traits_->GetRelativeInstallDir());
   if (!base::PathExists(path)) {
     DVLOG(1) << "Relative install dir does not exist: " << path.MaybeAsASCII();
     return false;
   }
 
   std::unique_ptr<base::DictionaryValue> manifest =
       update_client::ReadManifest(path);
   if (!manifest) {
     DVLOG(1) << "Manifest does not exist: " << path.MaybeAsASCII();
     return false;
@@ skipping 27 matching lines @@
 }
 
 void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) {
   VLOG(1) << __FUNCTION__ << " for " << installer_traits_->GetName();
   DCHECK(task_runner_.get());
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   base::Version latest_version(kNullVersion);
 
   // First check for an installation set up alongside Chrome itself.
-  if (FindPreinstallation())
+  base::FilePath root;
+  if (PathService::Get(DIR_COMPONENT_PREINSTALLED, &root) &&
+      FindPreinstallation(root)) {
     latest_version = current_version_;
+  }
+
+  // If there is a distinct alternate root, check there as well, and override
+  // anything found in the basic root.
+  base::FilePath root_alternate;
+  if (PathService::Get(DIR_COMPONENT_PREINSTALLED_ALT, &root_alternate) &&
+      root != root_alternate && FindPreinstallation(root_alternate)) {
+    latest_version = current_version_;
+  }
 
   // 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))
     return;
   base_dir = base_dir.Append(installer_traits_->GetRelativeInstallDir());
   if (!base::PathExists(base_dir) && !base::CreateDirectory(base_dir)) {
     PLOG(ERROR) << "Could not create the base directory for "
@@ skipping 129 matching lines @@
 
 void DefaultComponentInstaller::ComponentReady(
     std::unique_ptr<base::DictionaryValue> manifest) {
   VLOG(1) << "Component ready, version " << current_version_.GetString()
           << " in " << current_install_dir_.value();
   installer_traits_->ComponentReady(current_version_, current_install_dir_,
                                     std::move(manifest));
 }
 
 }  // namespace component_updater