Componentize component_updater: Move some paths/constants to component.

chrome/browser/component_updater/cld_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 CHROME_BROWSER_COMPONENT_UPDATER_CLD_COMPONENT_INSTALLER_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_CLD_COMPONENT_INSTALLER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/component_updater/default_component_installer.h"
 
 namespace test {
 class ScopedCLDDynamicDataHarness;
 }  // namespace test
 
 namespace component_updater {
 
 class ComponentUpdateService;
 
 // Visible for testing. No need to instantiate this class directly.
 class CldComponentInstallerTraits : public ComponentInstallerTraits {
  public:
-  CldComponentInstallerTraits();
+  CldComponentInstallerTraits(const base::FilePath& base_dir,
+                              const base::FilePath& data_filename);
   virtual ~CldComponentInstallerTraits() {}
 
  private:
   friend class CldComponentInstallerTest;  // For access within SetUp()
   friend class test::ScopedCLDDynamicDataHarness;  // For browser tests only
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, ComponentReady);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetBaseDirectory);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetHash);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetInstalledPath);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetName);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, OnCustomInstall);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, SetLatestCldDataFile);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, VerifyInstallation);
 
   // The following methods override ComponentInstallerTraits.
   virtual bool CanAutoUpdate() const OVERRIDE;
   virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
                                const base::FilePath& install_dir) OVERRIDE;
   virtual bool VerifyInstallation(
       const base::FilePath& install_dir) const OVERRIDE;
   virtual void ComponentReady(
       const base::Version& version,
       const base::FilePath& path,
       scoped_ptr<base::DictionaryValue> manifest) OVERRIDE;
   virtual base::FilePath GetBaseDirectory() const OVERRIDE;
   virtual void GetHash(std::vector<uint8>* hash) const OVERRIDE;
   virtual std::string GetName() const OVERRIDE;
 
-  static base::FilePath GetInstalledPath(const base::FilePath& base);
+  base::FilePath GetInstalledPath(const base::FilePath& base) const;

[Sorin Jianu, 2014/06/19 00:48:22]

It would be nice to not have to touch the definition of component installers as
a result of this refactoring. Especially, change the interface to their class.

[tommycli, 2014/06/23 21:55:28]

Done.

   static void SetLatestCldDataFile(const base::FilePath& path);
+
+  base::FilePath base_dir_;
+  base::FilePath data_filename_;
+
   DISALLOW_COPY_AND_ASSIGN(CldComponentInstallerTraits);
 };
 
 // Call once during startup to make the component update service aware of
 // the CLD component.
-void RegisterCldComponent(ComponentUpdateService* cus);
+void RegisterCldComponent(ComponentUpdateService* cus,
+                          const base::FilePath& base_dir,
+                          const base::FilePath& data_filename);
 
 // Returns the path to the latest CLD data file into the specified path object,
 // or an empty path if the CLD data file has not been observed yet.
 // This function is threadsafe.
 base::FilePath GetLatestCldDataFile();
 
 }  // namespace component_updater
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_CLD_COMPONENT_INSTALLER_H_