Add a new "Configure" mechanism to CLD browser-side data interfaces.

chrome/browser/component_updater/test/cld_component_installer_unittest.cc

 // 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.
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/component_updater/cld_component_installer.h"
-#include "components/translate/content/browser/data_file_browser_cld_data_provider.h"
+#include "components/translate/content/browser/browser_cld_data_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+using component_updater::CldComponentInstallerTraits;
+
 namespace {
 // This has to match what's in cld_component_installer.cc.
 const base::FilePath::CharType kTestCldDataFileName[] =
     FILE_PATH_LITERAL("cld2_data.bin");
+
 }  // namespace
 
 namespace component_updater {
 
 class CldComponentInstallerTest : public PlatformTest {
  public:
   CldComponentInstallerTest() {}
   virtual void SetUp() OVERRIDE {
     PlatformTest::SetUp();
 
     // ScopedTempDir automatically does a recursive delete on the entire
     // directory in its destructor, so no cleanup is required in TearDown.
     // Note that all files created by this test case are created within the
     // directory that is created here, so even though they are not explicitly
     // created *as temp files*, they will still get cleaned up automagically.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // The "latest CLD data file" is a static piece of information, and thus
     // for correctness we empty it before each test.
-    component_updater::CldComponentInstallerTraits::SetLatestCldDataFile(
-        base::FilePath());
+    CldComponentInstallerTraits::SetLatestCldDataFile(base::FilePath());
     base::FilePath path_now =
-        translate::DataFileBrowserCldDataProvider::GetCldDataFilePath();
+        CldComponentInstallerTraits::GetLatestCldDataFile();
     ASSERT_TRUE(path_now.empty());
   }
 
  protected:
   base::ScopedTempDir temp_dir_;
-  component_updater::CldComponentInstallerTraits traits_;
+  CldComponentInstallerTraits traits_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CldComponentInstallerTest);
 };
 
 TEST_F(CldComponentInstallerTest, SetLatestCldDataFile) {
   const base::FilePath expected(FILE_PATH_LITERAL("test/foo.test"));
-  component_updater::CldComponentInstallerTraits::SetLatestCldDataFile(
-      expected);
+  CldComponentInstallerTraits::SetLatestCldDataFile(expected);
   base::FilePath result =
-      translate::DataFileBrowserCldDataProvider::GetCldDataFilePath();
+      CldComponentInstallerTraits::GetLatestCldDataFile();
   ASSERT_EQ(expected, result);
 }
 
 TEST_F(CldComponentInstallerTest, VerifyInstallation) {
   // All files are created within a ScopedTempDir, which deletes all
   // children when its destructor is called (at the end of each test).
   ASSERT_FALSE(traits_.VerifyInstallation(temp_dir_.path()));
   const base::FilePath data_file_dir =
       temp_dir_.path().Append(FILE_PATH_LITERAL("_platform_specific")).Append(
           FILE_PATH_LITERAL("all"));
@@ skipping 33 matching lines @@
 TEST_F(CldComponentInstallerTest, GetName) {
   ASSERT_FALSE(traits_.GetName().empty());
 }
 
 TEST_F(CldComponentInstallerTest, ComponentReady) {
   scoped_ptr<base::DictionaryValue> manifest;
   const base::FilePath install_dir(FILE_PATH_LITERAL("/foo"));
   const base::Version version("1.2.3.4");
   traits_.ComponentReady(version, install_dir, manifest.Pass());
   base::FilePath result =
-      translate::DataFileBrowserCldDataProvider::GetCldDataFilePath();
+      CldComponentInstallerTraits::GetLatestCldDataFile();
   ASSERT_TRUE(StartsWith(result.AsUTF16Unsafe(),
                          install_dir.AsUTF16Unsafe(),
                          true));
   ASSERT_TRUE(EndsWith(result.value(), kTestCldDataFileName, true));
 }
 
 }  // namespace component_updater