chrome/browser/autocomplete/search_provider_unittest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/autocomplete/search_provider_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 months 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

« no previous file with comments | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/autocomplete/shortcuts_provider.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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/autocomplete/search_provider.h"	5 #include "chrome/browser/autocomplete/search_provider.h"

6	6

7 #include "base/metrics/field_trial.h"	7 #include "base/metrics/field_trial.h"

	8 #include "base/prefs/pref_service.h"

8 #include "base/run_loop.h"	9 #include "base/run_loop.h"

9 #include "base/string_util.h"	10 #include "base/string_util.h"

10 #include "base/time.h"	11 #include "base/time.h"

11 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

12 #include "build/build_config.h"	13 #include "build/build_config.h"

13 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"	14 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"

14 #include "chrome/browser/autocomplete/autocomplete_controller.h"	15 #include "chrome/browser/autocomplete/autocomplete_controller.h"

15 #include "chrome/browser/autocomplete/autocomplete_field_trial.h"	16 #include "chrome/browser/autocomplete/autocomplete_field_trial.h"

16 #include "chrome/browser/autocomplete/autocomplete_input.h"	17 #include "chrome/browser/autocomplete/autocomplete_input.h"

17 #include "chrome/browser/autocomplete/autocomplete_match.h"	18 #include "chrome/browser/autocomplete/autocomplete_match.h"

18 #include "chrome/browser/autocomplete/autocomplete_provider.h"	19 #include "chrome/browser/autocomplete/autocomplete_provider.h"

19 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"	20 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"

20 #include "chrome/browser/autocomplete/history_url_provider.h"	21 #include "chrome/browser/autocomplete/history_url_provider.h"

21 #include "chrome/browser/history/history_service.h"	22 #include "chrome/browser/history/history_service.h"

22 #include "chrome/browser/history/history_service_factory.h"	23 #include "chrome/browser/history/history_service_factory.h"

23 #include "chrome/browser/prefs/pref_service.h"

24 #include "chrome/browser/search_engines/template_url.h"	24 #include "chrome/browser/search_engines/template_url.h"

25 #include "chrome/browser/search_engines/template_url_service.h"	25 #include "chrome/browser/search_engines/template_url_service.h"

26 #include "chrome/browser/search_engines/template_url_service_factory.h"	26 #include "chrome/browser/search_engines/template_url_service_factory.h"

27 #include "chrome/browser/ui/browser_instant_controller.h"	27 #include "chrome/browser/ui/browser_instant_controller.h"

28 #include "chrome/common/metrics/entropy_provider.h"	28 #include "chrome/common/metrics/entropy_provider.h"

29 #include "chrome/common/pref_names.h"	29 #include "chrome/common/pref_names.h"

30 #include "chrome/test/base/testing_browser_process.h"	30 #include "chrome/test/base/testing_browser_process.h"

31 #include "chrome/test/base/testing_profile.h"	31 #include "chrome/test/base/testing_profile.h"

32 #include "content/public/test/test_browser_thread.h"	32 #include "content/public/test/test_browser_thread.h"

33 #include "net/url_request/test_url_fetcher_factory.h"	33 #include "net/url_request/test_url_fetcher_factory.h"

(...skipping 1532 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1566 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,	1566 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,

1567 match.contents_class[0].style);	1567 match.contents_class[0].style);

1568 EXPECT_EQ(4U, match.contents_class[1].offset);	1568 EXPECT_EQ(4U, match.contents_class[1].offset);

1569 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL \|	1569 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL \|

1570 AutocompleteMatch::ACMatchClassification::MATCH,	1570 AutocompleteMatch::ACMatchClassification::MATCH,

1571 match.contents_class[1].style);	1571 match.contents_class[1].style);

1572 EXPECT_EQ(5U, match.contents_class[2].offset);	1572 EXPECT_EQ(5U, match.contents_class[2].offset);

1573 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,	1573 EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,

1574 match.contents_class[2].style);	1574 match.contents_class[2].style);

1575 }	1575 }

OLD	NEW