Implement support in DefaultComponentInstaller for picking up bundled

components/component_updater/default_component_installer.cc

Index: components/component_updater/default_component_installer.cc
diff --git a/components/component_updater/default_component_installer.cc b/components/component_updater/default_component_installer.cc
index 1a7a3173a02a01575b93f4b06c0c439fc9e60c1d..61f2fe06c858bdc2758fd798ece5074aa924a0a7 100644
--- a/components/component_updater/default_component_installer.cc
+++ b/components/component_updater/default_component_installer.cc
@@ -12,11 +12,13 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
+#include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "base/version.h"
+#include "components/component_updater/component_updater_paths.h"
 // TODO(ddorwin): Find a better place for ReadManifest.
 #include "components/component_updater/component_updater_service.h"
 #include "components/update_client/component_unpacker.h"
@@ -106,8 +108,12 @@ bool DefaultComponentInstaller::Install(const base::DictionaryValue& manifest,
     return false;
   if (current_version_.CompareTo(version) > 0)
     return false;
-  base::FilePath install_path =
-      installer_traits_->GetBaseDirectory().AppendASCII(version.GetString());
+  base::FilePath install_path;
+  if (!PathService::Get(DIR_COMPONENT_USER, &install_path))
+    return false;
+  install_path =
+      install_path.AppendASCII(installer_traits_->GetASCIIDirectoryName())
+          .AppendASCII(version.GetString());
   if (base::PathExists(install_path)) {
     if (!base::DeleteFile(install_path, true))
       return false;
@@ -117,6 +123,7 @@ bool DefaultComponentInstaller::Install(const base::DictionaryValue& manifest,
     return false;
   }
   current_version_ = version;
+  current_install_dir_ = install_path;
   // TODO(ddorwin): Change parameter to std::unique_ptr<base::DictionaryValue>
   // so we can avoid this DeepCopy.
   current_manifest_.reset(manifest.DeepCopy());
@@ -134,10 +141,7 @@ bool DefaultComponentInstaller::GetInstalledFile(
     base::FilePath* installed_file) {
   if (current_version_ == base::Version(kNullVersion))
     return false;  // No component has been installed yet.
-
-  *installed_file = installer_traits_->GetBaseDirectory()
-                        .AppendASCII(current_version_.GetString())
-                        .AppendASCII(file);
+  *installed_file = current_install_dir_.AppendASCII(file);
   return true;
 }
 
@@ -152,18 +156,44 @@ bool DefaultComponentInstaller::Uninstall() {
 void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) {
   DCHECK(task_runner_.get());
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  base::FilePath base_dir = installer_traits_->GetBaseDirectory();
+
+  base::Version latest_version(kNullVersion);
+
+  // First check for a system-wide installation.
+  base::FilePath path;
+  if (PathService::Get(DIR_COMPONENT_SYSTEM, &path)) {
+    path = path.AppendASCII(installer_traits_->GetASCIIDirectoryName());
+    if (base::PathExists(path)) {
+      std::unique_ptr<base::DictionaryValue> manifest =
+          update_client::ReadManifest(path);
+      if (manifest && installer_traits_->VerifyInstallation(*manifest, path)) {
+        std::string version_s;

[xhwang, 2016/05/02 17:47:00]

nit: "Names should be descriptive; eschew abbreviation"... how about
version_system?

[waffles, 2016/05/03 21:04:22]

Done.

+        if (manifest->GetStringASCII("version", &version_s)) {
+          base::Version version(version_s);
+          if (version.IsValid()) {
+            current_install_dir_ = path;
+            current_manifest_ = std::move(manifest);
+            current_version_ = version;
+            latest_version = version;
+          }
+        }
+      }
+    }
+  }

[xhwang, 2016/05/02 17:47:00]

nit: It might be clearer to wrap this block into a static helper function that
returns a boolean "success" so that you can return early upon any failure case.
This way you can break the 5-if-block into smaller pieces.

[waffles, 2016/05/03 21:04:22]

Done.

+
+  // 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.AppendASCII(installer_traits_->GetASCIIDirectoryName());
   if (!base::PathExists(base_dir) && !base::CreateDirectory(base_dir)) {
     PLOG(ERROR) << "Could not create the base directory for "
                 << installer_traits_->GetName() << " ("
                 << base_dir.MaybeAsASCII() << ").";
     return;
   }
-
-  base::FilePath latest_path;
-  base::Version latest_version(kNullVersion);
-  std::unique_ptr<base::DictionaryValue> latest_manifest;
-
   std::vector<base::FilePath> older_paths;
   base::FileEnumerator file_enumerator(
       base_dir, false, base::FileEnumerator::DIRECTORIES);
@@ -196,10 +226,8 @@ void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) {
 
     // New valid |version| folder found!
 
-    if (latest_manifest) {
-      DCHECK(!latest_path.empty());
+    if (!latest_path.empty())
       older_paths.push_back(latest_path);
-    }
 
     latest_path = path;
     latest_version = version;
@@ -209,6 +237,7 @@ void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) {
   if (latest_manifest) {
     current_version_ = latest_version;
     current_manifest_ = std::move(latest_manifest);
+    current_install_dir_ = latest_path;
     // TODO(ddorwin): Remove these members and pass them directly to
     // FinishRegistration().
     base::ReadFileToString(latest_path.AppendASCII("manifest.fingerprint"),
@@ -224,9 +253,15 @@ void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) {
 void DefaultComponentInstaller::UninstallOnTaskRunner() {
   DCHECK(task_runner_.get());
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  const base::FilePath base_dir = installer_traits_->GetBaseDirectory();
 
-  base::FileEnumerator file_enumerator(base_dir, false,
+  // Only try to delete any files that are in our user-level install path.
+  base::FilePath userInstallPath;
+  if (!PathService::Get(DIR_COMPONENT_USER, &userInstallPath))
+    return;
+  if (!userInstallPath.IsParent(current_install_dir_))
+    return;
+
+  base::FileEnumerator file_enumerator(current_install_dir_, false,
                                        base::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
@@ -242,17 +277,12 @@ void DefaultComponentInstaller::UninstallOnTaskRunner() {
   }
 
   // Delete the base directory if it's empty now.
-  if (base::IsDirectoryEmpty(base_dir)) {
-    if (base::DeleteFile(base_dir, false))
-      DLOG(ERROR) << "Couldn't delete " << base_dir.value();
+  if (base::IsDirectoryEmpty(current_install_dir_)) {
+    if (base::DeleteFile(current_install_dir_, false))
+      DLOG(ERROR) << "Couldn't delete " << current_install_dir_.value();
   }
 }
 
-base::FilePath DefaultComponentInstaller::GetInstallDirectory() {
-  return installer_traits_->GetBaseDirectory()
-      .AppendASCII(current_version_.GetString());
-}
-
 void DefaultComponentInstaller::FinishRegistration(
     ComponentUpdateService* cus,
     const base::Closure& callback) {
@@ -287,8 +317,8 @@ void DefaultComponentInstaller::FinishRegistration(
 void DefaultComponentInstaller::ComponentReady(
     std::unique_ptr<base::DictionaryValue> manifest) {
   VLOG(1) << "Component ready, version " << current_version_.GetString()
-          << " in " << GetInstallDirectory().value();
-  installer_traits_->ComponentReady(current_version_, GetInstallDirectory(),
+          << " in " << current_install_dir_.value();
+  installer_traits_->ComponentReady(current_version_, current_install_dir_,
                                     std::move(manifest));
 }