| Index: chrome/browser/search/instant_unittest_base.h
|
| diff --git a/chrome/browser/search/instant_unittest_base.h b/chrome/browser/search/instant_unittest_base.h
|
| index a97e595cebfa5353853d7ba8662001d5af35d27d..31da756a82abf26f984acad711b75d60fc1202dc 100644
|
| --- a/chrome/browser/search/instant_unittest_base.h
|
| +++ b/chrome/browser/search/instant_unittest_base.h
|
| @@ -25,8 +25,12 @@ class InstantUnitTestBase : public BrowserWithTestWindowTest {
|
| virtual void SetUp() OVERRIDE;
|
| virtual void TearDown() OVERRIDE;
|
|
|
| - virtual void SetUpWithoutCacheableNTP();
|
| - virtual void SetUpHelper();
|
| + void SetUpWithoutCacheableNTP();
|
| +
|
| +#if !defined(OS_IOS) && !defined(OS_ANDROID)
|
| + // Query extraction is always enabled on Android and iOS.
|
| + void SetUpWithoutQueryExtraction();
|
| +#endif
|
|
|
| // Adds and sets the default search provider using the base_url.
|
| // The base_url should have the http[s]:// prefix and a trailing / after the
|
| @@ -45,6 +49,9 @@ class InstantUnitTestBase : public BrowserWithTestWindowTest {
|
| InstantService* instant_service_;
|
| TemplateURLService* template_url_service_;
|
| scoped_ptr<base::FieldTrialList> field_trial_list_;
|
| +
|
| + private:
|
| + void SetUpHelper();
|
| };
|
|
|
| #endif // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_
|
|
|