Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(695)

Unified Diff: chrome/browser/translate/cld_data_harness.cc

Issue 461633002: Refactor language detection logic to allow non-static CLD data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make some of the harness factory methods private Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/translate/cld_data_harness.h ('k') | chrome/browser/translate/cld_data_harness_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..1a3a7f3eb1864aaca71f1aa384aaee20d27140f9 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,19 @@ 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:
+ StaticCldDataHarness() {}
+ ~StaticCldDataHarness() override {};
+ void Init() override {
+ translate::CldDataSource::Set(
+ translate::CldDataSource::GetStaticDataSource());
+ }
+ private:
+ DISALLOW_COPY_AND_ASSIGN(StaticCldDataHarness);
+};
+
} // namespace
namespace test {
@@ -29,4 +46,22 @@ void CldDataHarness::GetTestDataSourceDirectory(base::FilePath* out_path) {
out_path->Append(FILE_PATH_LITERAL("cld2_component")).Append(kCrxVersion);
}
+// static
+scoped_ptr<CldDataHarness>
+CldDataHarness::CreateStaticDataHarness() {
+ return scoped_ptr<CldDataHarness>(new StaticCldDataHarness());
+}
+
+// static
+scoped_ptr<CldDataHarness>
+CldDataHarness::CreateStandaloneDataHarness() {
+ return scoped_ptr<CldDataHarness>(new StandaloneCldDataHarness());
+}
+
+// static
+scoped_ptr<CldDataHarness>
+CldDataHarness::CreateComponentDataHarness() {
+ return scoped_ptr<CldDataHarness>(new ComponentCldDataHarness());
+}
+
} // namespace test
« no previous file with comments | « chrome/browser/translate/cld_data_harness.h ('k') | chrome/browser/translate/cld_data_harness_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698