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

chrome/browser/translate/cld_data_harness.cc

Index: chrome/browser/translate/cld_data_harness.cc
diff --git a/chrome/browser/translate/cld_data_harness.cc b/chrome/browser/translate/cld_data_harness.cc
index 9546d6f256fd55056bcbe95d072944fdab2f16b7..4230dae879e936179fc8b01a6c96b0693d981bd5 100644
--- a/chrome/browser/translate/cld_data_harness.cc
+++ b/chrome/browser/translate/cld_data_harness.cc
@@ -4,8 +4,12 @@
 
 #include "chrome/browser/translate/cld_data_harness.h"
 
+#include "base/lazy_instance.h"
 #include "base/path_service.h"
+#include "chrome/browser/translate/component_cld_data_harness.h"
+#include "chrome/browser/translate/standalone_cld_data_harness.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/translate/content/common/cld_data_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -15,6 +19,21 @@ namespace {
 // chrome/test/data/cld2_component/README.chromium; don't update one without
 // updating the other.
 const base::FilePath::CharType kCrxVersion[] = FILE_PATH_LITERAL("160");
+
+class StaticCldDataHarness : public test::CldDataHarness {
+ public:
+  virtual void Init() override {
+    translate::CldDataSource::Set(translate::CldDataSource::STATIC(), true);
+  }
+};

[jochen (gone - plz use gerrit), 2014/10/23 13:57:38]

disallow copy/assing + virtual dtor

[Andrew Hayden (chromium.org), 2014/10/30 16:56:31]

Done.

+
+class NoneCldDataHarness : public test::CldDataHarness {
+ public:
+  virtual void Init() override {
+    translate::CldDataSource::Set(translate::CldDataSource::NONE(), true);
+  }
+};
+
 }  // namespace
 
 namespace test {
@@ -29,4 +48,20 @@ void CldDataHarness::GetTestDataSourceDirectory(base::FilePath* out_path) {
       out_path->Append(FILE_PATH_LITERAL("cld2_component")).Append(kCrxVersion);
 }
 
+/* static */ scoped_ptr<CldDataHarness> CldDataHarness::NONE() {

[Takashi Toyoshima, 2014/10/15 08:45:07]

This style is not used in chromium.

// static
scoped_ptr<CldDataHarness> CldDataHarness::CreateNoneCldDataHarness() {
  ...
}

will be better.

[Andrew Hayden (chromium.org), 2014/10/30 16:56:31]

Done across all the classes I'm touching. There are still several instances in
Chromium, the funny part being that there are a few where the /* static */ is on
its own line :) But none of those others ones are mine <whistles>

+  return scoped_ptr<CldDataHarness>(new NoneCldDataHarness());
+}
+
+/* static */ scoped_ptr<CldDataHarness> CldDataHarness::STATIC() {
+  return scoped_ptr<CldDataHarness>(new StaticCldDataHarness());
+}
+
+/* static */ scoped_ptr<CldDataHarness> CldDataHarness::STANDALONE() {
+  return scoped_ptr<CldDataHarness>(new StandaloneCldDataHarness());
+}
+
+/* static */ scoped_ptr<CldDataHarness> CldDataHarness::COMPONENT() {
+  return scoped_ptr<CldDataHarness>(new ComponentCldDataHarness());
+}
+
 }  // namespace test