Modularize Compact Language Detector 2 (CLD2) data sources

chrome/browser/component_updater/cld_component_installer.h

Index: chrome/browser/component_updater/cld_component_installer.h
diff --git a/chrome/browser/component_updater/cld_component_installer.h b/chrome/browser/component_updater/cld_component_installer.h
index 9e92c71128d732e6b092583b763bcfa219591835..b226aac872843253a850d655287cfbb1b50c14a5 100644
--- a/chrome/browser/component_updater/cld_component_installer.h
+++ b/chrome/browser/component_updater/cld_component_installer.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/component_updater/default_component_installer.h"
 
 namespace test {
-class ScopedCLDDynamicDataHarness;
+class ComponentCldDataHarness;
 }  // namespace test
 
 namespace component_updater {
@@ -28,7 +28,7 @@ class CldComponentInstallerTraits : public ComponentInstallerTraits {
 
  private:
   friend class CldComponentInstallerTest;  // For access within SetUp()
-  friend class test::ScopedCLDDynamicDataHarness;  // For browser tests only
+  friend class test::ComponentCldDataHarness;  // For browser tests only
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, ComponentReady);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetBaseDirectory);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetHash);
@@ -53,7 +53,13 @@ class CldComponentInstallerTraits : public ComponentInstallerTraits {
   virtual std::string GetName() const OVERRIDE;
 
   static base::FilePath GetInstalledPath(const base::FilePath& base);
+
+  // Sets the path to the CLD data file. Called internally once a valid CLD
+  // data file has been observed. The implementation of this method is
+  // responsible for configuring the CLD data source.
+  // This method is threadsafe.
   static void SetLatestCldDataFile(const base::FilePath& path);
+
   DISALLOW_COPY_AND_ASSIGN(CldComponentInstallerTraits);
 };
 
@@ -61,11 +67,6 @@ class CldComponentInstallerTraits : public ComponentInstallerTraits {
 // the CLD component.
 void RegisterCldComponent(ComponentUpdateService* cus);
 
-// 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_