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

chrome/browser/component_updater/cld_component_installer.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 "chrome/browser/component_updater/cld_component_installer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "components/component_updater/component_updater_paths.h"
-#include "components/translate/content/browser/data_file_browser_cld_data_provider.h"
+#include "components/translate/content/browser/browser_cld_data_provider.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/ssl/ssl_config_service.h"
 
 using component_updater::ComponentUpdateService;
 
 namespace {
 // TODO(andrewhayden): Make the data file path into a gyp/gn define
 // If you change this, also update component_cld_data_harness.cc
 // and cld_component_installer_unittest.cc accordingly!
 const base::FilePath::CharType kCldDataFileName[] =
-    FILE_PATH_LITERAL("cld2_data.bin");
+  FILE_PATH_LITERAL("cld2_data.bin");
+
+// Tracks the last value seen in SetLatestCldDataFile, for testing purposes.
+base::LazyInstance<base::FilePath>::Leaky g_latest_cld_data_file_for_test =
+  LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 namespace component_updater {
 
 // The SHA256 of the SubjectPublicKeyInfo used to sign the extension.
 // The extension id is: dpedmmgabcgnikllifiidmijgoiihfgf
 const uint8 kPublicKeySHA256[32] = {
     0x3f, 0x43, 0xcc, 0x60, 0x12, 0x6d, 0x8a, 0xbb,
     0x85, 0x88, 0x3c, 0x89, 0x6e, 0x88, 0x75, 0x65,
     0xb9, 0x46, 0x09, 0xe8, 0xca, 0x92, 0xdd, 0x82,
@@ skipping 70 matching lines @@
       new CldComponentInstallerTraits());
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(traits.Pass());
   installer->Register(cus);
 }
 
 void CldComponentInstallerTraits::SetLatestCldDataFile(
     const base::FilePath& path) {
   VLOG(1) << "Setting CLD data file location: " << path.value();
-  translate::DataFileBrowserCldDataProvider::SetCldDataFilePath(path);
+  *g_latest_cld_data_file_for_test.Pointer() = path;
+  translate::ConfigureBrowserCldDataProvider(&path);
+}
+
+base::FilePath CldComponentInstallerTraits::GetLatestCldDataFile_ForTest() {
+  return *g_latest_cld_data_file_for_test.Pointer();
 }
 
 }  // namespace component_updater