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

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

Issue 231863008: Rename SetDefaultSearchProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 8 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
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 #ifndef CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_ 5 #ifndef CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_
6 #define CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_ 6 #define CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 17 matching lines...) Expand all
28 #if !defined(OS_IOS) && !defined(OS_ANDROID) 28 #if !defined(OS_IOS) && !defined(OS_ANDROID)
29 // Query extraction is always enabled on Android and iOS. 29 // Query extraction is always enabled on Android and iOS.
30 void SetUpWithoutQueryExtraction(); 30 void SetUpWithoutQueryExtraction();
31 #endif 31 #endif
32 32
33 // Adds and sets the default search provider using the base_url. 33 // Adds and sets the default search provider using the base_url.
34 // The base_url should have the http[s]:// prefix and a trailing / after the 34 // The base_url should have the http[s]:// prefix and a trailing / after the
35 // TLD. 35 // TLD.
36 // It will always use an instant-enabled configuration using a 36 // It will always use an instant-enabled configuration using a
37 // search_terms_replacement_key. 37 // search_terms_replacement_key.
38 void SetDefaultSearchProvider(const std::string& base_url); 38 void SetUserSelectedDefaultSearchProvider(const std::string& base_url);
39 39
40 // Simulates a Google Base URL change as would happen in event of 40 // Simulates a Google Base URL change as would happen in event of
41 // search-domain-check. Note that the GoogleURLTrackerFactory is disabled for 41 // search-domain-check. Note that the GoogleURLTrackerFactory is disabled for
42 // tests, so this is required. 42 // tests, so this is required.
43 void NotifyGoogleBaseURLUpdate(const std::string& new_google_base_url); 43 void NotifyGoogleBaseURLUpdate(const std::string& new_google_base_url);
44 44
45 bool IsInstantServiceObserver(InstantServiceObserver* observer); 45 bool IsInstantServiceObserver(InstantServiceObserver* observer);
46 46
47 InstantService* instant_service_; 47 InstantService* instant_service_;
48 TemplateURLService* template_url_service_; 48 TemplateURLService* template_url_service_;
49 scoped_ptr<base::FieldTrialList> field_trial_list_; 49 scoped_ptr<base::FieldTrialList> field_trial_list_;
50 50
51 private: 51 private:
52 void SetUpHelper(); 52 void SetUpHelper();
53 }; 53 };
54 54
55 #endif // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_ 55 #endif // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_
OLDNEW
« no previous file with comments | « chrome/browser/search/instant_service_unittest.cc ('k') | chrome/browser/search/instant_unittest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698