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

Side by Side 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: All remaining comments addressed 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/translate/cld_data_harness.h" 5 #include "chrome/browser/translate/cld_data_harness.h"
6 6
7 #include "base/lazy_instance.h"
7 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/browser/translate/component_cld_data_harness.h"
10 #include "chrome/browser/translate/standalone_cld_data_harness.h"
8 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "components/translate/content/common/cld_data_source.h"
9 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
10 14
11 namespace { 15 namespace {
12 // This constant yields the version of the CRX that has been extracted into 16 // This constant yields the version of the CRX that has been extracted into
13 // the test data directory, and must be kept in sync with what is there. 17 // the test data directory, and must be kept in sync with what is there.
14 // A reciprocal comment has been placed in 18 // A reciprocal comment has been placed in
15 // chrome/test/data/cld2_component/README.chromium; don't update one without 19 // chrome/test/data/cld2_component/README.chromium; don't update one without
16 // updating the other. 20 // updating the other.
17 const base::FilePath::CharType kCrxVersion[] = FILE_PATH_LITERAL("160"); 21 const base::FilePath::CharType kCrxVersion[] = FILE_PATH_LITERAL("160");
22
23 class StaticCldDataHarness : public test::CldDataHarness {
24 public:
25 virtual ~StaticCldDataHarness();
26 virtual void Init() override {
27 translate::CldDataSource::Set(
28 translate::CldDataSource::GetStaticDataSource());
29 }
30 private:
31 DISALLOW_COPY_AND_ASSIGN(StaticCldDataHarness);
32 };
33
18 } // namespace 34 } // namespace
19 35
20 namespace test { 36 namespace test {
21 37
22 const base::FilePath::CharType* CldDataHarness::GetTestDataSourceCrxVersion() { 38 const base::FilePath::CharType* CldDataHarness::GetTestDataSourceCrxVersion() {
23 return kCrxVersion; 39 return kCrxVersion;
24 } 40 }
25 41
26 void CldDataHarness::GetTestDataSourceDirectory(base::FilePath* out_path) { 42 void CldDataHarness::GetTestDataSourceDirectory(base::FilePath* out_path) {
27 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, out_path)); 43 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, out_path));
28 *out_path = 44 *out_path =
29 out_path->Append(FILE_PATH_LITERAL("cld2_component")).Append(kCrxVersion); 45 out_path->Append(FILE_PATH_LITERAL("cld2_component")).Append(kCrxVersion);
30 } 46 }
31 47
48 // static
49 scoped_ptr<CldDataHarness>
50 CldDataHarness::CreateStaticDataHarness() {
51 return scoped_ptr<CldDataHarness>(new StaticCldDataHarness());
52 }
53
54 // static
55 scoped_ptr<CldDataHarness>
56 CldDataHarness::CreateStandaloneDataHarness() {
57 return scoped_ptr<CldDataHarness>(new StandaloneCldDataHarness());
58 }
59
60 // static
61 scoped_ptr<CldDataHarness>
62 CldDataHarness::CreateComponentDataHarness() {
63 return scoped_ptr<CldDataHarness>(new ComponentCldDataHarness());
64 }
65
32 } // namespace test 66 } // namespace test
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698