Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / search / instant_unittest_base.h

diff --git a/src/chrome/browser/search/instant_unittest_base.h b/src/chrome/browser/search/instant_unittest_base.h
index a97e595..a99b2f0 100644 (file)
--- a/src/chrome/browser/search/instant_unittest_base.h
+++ b/src/chrome/browser/search/instant_unittest_base.h
@@ -9,8 +9,8 @@
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/search/instant_service.h"
-#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "components/search_engines/template_url_service.h"
 
 class InstantServiceObserver;
 
@@ -20,20 +20,22 @@ class InstantServiceObserver;
 class InstantUnitTestBase : public BrowserWithTestWindowTest {
  protected:
   InstantUnitTestBase();
-  virtual ~InstantUnitTestBase();
+  ~InstantUnitTestBase() override;
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  void SetUp() override;
+  void TearDown() override;
 
-  virtual void SetUpWithoutCacheableNTP();
-  virtual void SetUpHelper();
+#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
   // TLD.
   // It will always use an instant-enabled configuration using a
   // search_terms_replacement_key.
-  void SetDefaultSearchProvider(const std::string& base_url);
+  void SetUserSelectedDefaultSearchProvider(const std::string& base_url);
 
   // Simulates a Google Base URL change as would happen in event of
   // search-domain-check. Note that the GoogleURLTrackerFactory is disabled for
@@ -45,6 +47,12 @@ class InstantUnitTestBase : public BrowserWithTestWindowTest {
   InstantService* instant_service_;
   TemplateURLService* template_url_service_;
   scoped_ptr<base::FieldTrialList> field_trial_list_;
+
+ private:
+  // BrowserWithTestWindowTest override:
+  TestingProfile* CreateProfile() override;
+
+  void SetUpHelper();
 };
 
 #endif  // CHROME_BROWSER_SEARCH_INSTANT_UNITTEST_BASE_H_