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..98020e75b00de73df78cd7d01b59e6bb31b5307e 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 ScopedCldComponentDataHarness;
 }  // 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::ScopedCldComponentDataHarness;  // For browser tests only
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, ComponentReady);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetBaseDirectory);
   FRIEND_TEST_ALL_PREFIXES(CldComponentInstallerTest, GetHash);
@@ -54,6 +54,7 @@ class CldComponentInstallerTraits : public ComponentInstallerTraits {
 
   static base::FilePath GetInstalledPath(const base::FilePath& base);
   static void SetLatestCldDataFile(const base::FilePath& path);
+  static const base::FilePath::CharType* GetCldDataFileName();
   DISALLOW_COPY_AND_ASSIGN(CldComponentInstallerTraits);
 };
 
@@ -61,11 +62,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_