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

Side by Side Diff: chrome/browser/search/instant_unittest_base.cc

Issue 324283003: Move search_terms_data to components/search_engines (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/search/instant_service.cc ('k') | chrome/browser/search/search_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/instant_unittest_base.h" 5 #include "chrome/browser/search/instant_unittest_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/search/instant_service.h" 12 #include "chrome/browser/search/instant_service.h"
13 #include "chrome/browser/search/instant_service_factory.h" 13 #include "chrome/browser/search/instant_service_factory.h"
14 #include "chrome/browser/search/search.h" 14 #include "chrome/browser/search/search.h"
15 #include "chrome/browser/search_engines/search_terms_data.h"
16 #include "chrome/browser/search_engines/template_url.h" 15 #include "chrome/browser/search_engines/template_url.h"
17 #include "chrome/browser/search_engines/template_url_service.h" 16 #include "chrome/browser/search_engines/template_url_service.h"
18 #include "chrome/browser/search_engines/template_url_service_factory.h" 17 #include "chrome/browser/search_engines/template_url_service_factory.h"
18 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/browser_with_test_window_test.h" 20 #include "chrome/test/base/browser_with_test_window_test.h"
21 #include "chrome/test/base/testing_pref_service_syncable.h" 21 #include "chrome/test/base/testing_pref_service_syncable.h"
22 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
23 #include "components/google/core/browser/google_pref_names.h" 23 #include "components/google/core/browser/google_pref_names.h"
24 #include "components/google/core/browser/google_url_tracker.h" 24 #include "components/google/core/browser/google_url_tracker.h"
25 #include "components/variations/entropy_provider.h" 25 #include "components/variations/entropy_provider.h"
26 26
27 InstantUnitTestBase::InstantUnitTestBase() { 27 InstantUnitTestBase::InstantUnitTestBase() {
28 field_trial_list_.reset(new base::FieldTrialList( 28 field_trial_list_.reset(new base::FieldTrialList(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); 96 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile());
97 ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); 97 ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_);
98 98
99 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); 99 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/");
100 TestingPrefServiceSyncable* pref_service = profile()->GetTestingPrefService(); 100 TestingPrefServiceSyncable* pref_service = profile()->GetTestingPrefService();
101 pref_service->SetUserPref(prefs::kLastPromptedGoogleURL, 101 pref_service->SetUserPref(prefs::kLastPromptedGoogleURL,
102 new base::StringValue("https://www.google.com/")); 102 new base::StringValue("https://www.google.com/"));
103 SetUserSelectedDefaultSearchProvider("{google:baseURL}"); 103 SetUserSelectedDefaultSearchProvider("{google:baseURL}");
104 instant_service_ = InstantServiceFactory::GetForProfile(profile()); 104 instant_service_ = InstantServiceFactory::GetForProfile(profile());
105 } 105 }
OLDNEW
« no previous file with comments | « chrome/browser/search/instant_service.cc ('k') | chrome/browser/search/search_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698