Refactor language detection logic to allow non-static CLD data sources.

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/files/file_path.h"
 #include "base/files/file_util.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/browser_cld_data_provider.h"
+#include "components/translate/content/browser/browser_cld_data_provider_factory.h"
 #include "components/translate/content/common/cld_data_source.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!
@@ skipping 73 matching lines @@
   hash->assign(kPublicKeySHA256,
                kPublicKeySHA256 + arraysize(kPublicKeySHA256));
 }
 
 std::string CldComponentInstallerTraits::GetName() const {
   return kCldManifestName;
 }
 
 void RegisterCldComponent(ComponentUpdateService* cus) {
   // Make sure we don't start up if the CLD data source isn't compatible.
-  if (!translate::CldDataSource::ShouldRegisterForComponentUpdates()) {
+  if (translate::CldDataSource::Get() !=
+      translate::CldDataSource::GetComponentDataSource()) {
     // This is a serious build-time configuration error.

[picksi1, 2014/10/30 17:37:32]

The above 2 lines appear three times. Can we wrap them into a single function
e.g.

if (translate::CldDataSource::IsIncompatible()) {
....
}

[Andrew Hayden (chromium.org), 2014/10/30 17:51:13]

I don't think it's worth it. It can't just be
translate::CldDataSource::IsIncompatible() because that question can't be
answered without context: compatible *with what*? The answer here is compatible
with the component updater, but there is only one such data source and it is the
ComponentCldDataSource. Which is why I did away with the booleans we previously
passed to the CldDataSource constructor along with all those pointless private
classes.

I don't particularly mind adding another method here, I just don't think it will
actually clean anything up. There's not likely to be any more code that ever
needs this particular check, since all of the logic starts here.

     LOG(ERROR) << "Wrong CLD data source: " <<
-        translate::CldDataSource::GetName();
+        translate::CldDataSource::Get()->GetName();
     NOTREACHED();
     return;
   }
 
   // This log line is to help with determining which kind of provider has been
   // configured. See also: chrome://translate-internals
   VLOG(1) << "Registering CLD component with the component update service";
 
   scoped_ptr<ComponentInstallerTraits> traits(
       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();
   g_latest_cld_data_file.Get() = path;
-  translate::SetCldDataFilePath(path);
+  translate::CldDataSource::Get()->SetCldDataFilePath(path);
 }
 
 base::FilePath CldComponentInstallerTraits::GetLatestCldDataFile() {
   return g_latest_cld_data_file.Get();
 }
 
 }  // namespace component_updater