Implement support in DefaultComponentInstaller for picking up bundled

components/component_updater/default_component_installer.h

 // 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.
 
 #ifndef COMPONENTS_COMPONENT_UPDATER_DEFAULT_COMPONENT_INSTALLER_H_
 #define COMPONENTS_COMPONENT_UPDATER_DEFAULT_COMPONENT_INSTALLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "components/update_client/update_client.h"
 
 namespace base {
-class FilePath;
 class SequencedTaskRunner;
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace component_updater {
 
 class ComponentUpdateService;
 
 // Components should use a DefaultComponentInstaller by defining a class that
 // implements the members of ComponentInstallerTraits, and then registering a
@@ skipping 35 matching lines @@
   // notified of a successful install, and is meant to support follow-on work
   // such as updating paths elsewhere in Chrome. Called on the UI thread.
   // |version| is the version of the component.
   // |install_dir| is the path to the install directory for this version.
   // |manifest| is the manifest for this version of the component.
   virtual void ComponentReady(
       const base::Version& version,
       const base::FilePath& install_dir,
       std::unique_ptr<base::DictionaryValue> manifest) = 0;
 
-  // Returns the directory that the installer will place versioned installs of
-  // the component into.
-  virtual base::FilePath GetBaseDirectory() const = 0;
+  // Returns a filesystem-safe name that will be used as the directory name for

[Sorin Jianu, 2016/05/03 21:51:24]

filesystem-safe is redundant now, since the return value is a file path now.

[waffles, 2016/05/03 22:14:05]

Done.

+  // the component's contents.
+  virtual base::FilePath GetRelativeInstallDir() const = 0;
 
   // Returns the component's SHA2 hash as raw bytes.
   virtual void GetHash(std::vector<uint8_t>* hash) const = 0;
 
   // Returns the human-readable name of the component.
   virtual std::string GetName() const = 0;
 
   // Returns the additional parameters to be used in the update checks for
   // this component. A compatible server may use this attribute to negotiate
   // special update rules when issuing an update response.
@@ skipping 13 matching lines @@
   // The passed |callback| will be called once the initial check for installed
   // versions is done and the component has been registered.
   void Register(ComponentUpdateService* cus, const base::Closure& callback);
 
   // Overridden from ComponentInstaller:
   void OnUpdateError(int error) override;
   bool Install(const base::DictionaryValue& manifest,
                const base::FilePath& unpack_path) override;
   bool GetInstalledFile(const std::string& file,
                         base::FilePath* installed_file) override;
+  // Only user-level component installations can be uninstalled.
   bool Uninstall() override;
 
  private:
   ~DefaultComponentInstaller() override;
 
-  base::FilePath GetInstallDirectory();
+  bool LoadSystemInstallation();

[xhwang, 2016/05/03 22:49:42]

nit: document what it does and what the return value is

[waffles, 2016/05/10 18:15:53]

Done.

   bool InstallHelper(const base::DictionaryValue& manifest,
                      const base::FilePath& unpack_path,
                      const base::FilePath& install_path);
   void StartRegistration(ComponentUpdateService* cus);
   void FinishRegistration(ComponentUpdateService* cus,
                           const base::Closure& callback);
   void ComponentReady(std::unique_ptr<base::DictionaryValue> manifest);
   void UninstallOnTaskRunner();
 
+  base::FilePath current_install_dir_;
   base::Version current_version_;
   std::string current_fingerprint_;
   std::unique_ptr<base::DictionaryValue> current_manifest_;
   std::unique_ptr<ComponentInstallerTraits> installer_traits_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // Used to post responses back to the main thread. Initialized on the main
   // loop but accessed from the task runner.
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultComponentInstaller);
 };
 
 }  // namespace component_updater
 
 #endif  // COMPONENTS_COMPONENT_UPDATER_DEFAULT_COMPONENT_INSTALLER_H_