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

chrome/browser/translate/standalone_cld_data_harness.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 "standalone_cld_data_harness.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/translate/content/common/cld_data_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // This has to match what's in chrome_translate_client.cc
 const base::FilePath::CharType kStandaloneDataFileName[] =
     FILE_PATH_LITERAL("cld2_data.bin");
 
 }  // namespace
 
 namespace test {
 
-StandaloneCldDataHarness::StandaloneCldDataHarness() {
-  // Constructor does nothing in all cases. See Init() for initialization.
-}
-
 StandaloneCldDataHarness::~StandaloneCldDataHarness() {
   DVLOG(1) << "Tearing down CLD data harness";
   DeleteStandaloneDataFile();
 }
 
 void StandaloneCldDataHarness::Init() {
   DVLOG(1) << "Initializing CLD data harness";
   // Dynamic data mode is enabled and we are using a standalone file.
+  translate::CldDataSource::Set(
+      translate::CldDataSource::GetStandaloneDataSource());
   ASSERT_NO_FATAL_FAILURE(CopyStandaloneDataFile());
 }
 
 void StandaloneCldDataHarness::GetStandaloneDataFileSource(
     base::FilePath* out_path) {
   CldDataHarness::GetTestDataSourceDirectory(out_path);
   *out_path = out_path->Append(FILE_PATH_LITERAL("_platform_specific"))
                   .Append(FILE_PATH_LITERAL("all"))
                   .Append(kStandaloneDataFileName);
 }
@@ skipping 21 matching lines @@
   base::FilePath target_dir = target_file.DirName();
   ASSERT_TRUE(base::CreateDirectoryAndGetError(target_dir, NULL));
   base::FilePath source_file;
   GetStandaloneDataFileSource(&source_file);
   DVLOG(1) << "Copying CLD test data file from " << source_file.value()
            << " to " << target_file.value();
   ASSERT_TRUE(base::CopyFile(source_file, target_file));
   ASSERT_TRUE(base::PathExists(target_file));
 }
 
-scoped_ptr<CldDataHarness> CreateCldDataHarness() {
-  scoped_ptr<CldDataHarness> result(new StandaloneCldDataHarness());
-  return result.Pass();
-}
-
 }  // namespace test