| Index: chrome/browser/ui/search/instant_test_utils.h
|
| diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h
|
| index 1e3c7b51fb0d264611f752b8172fd095be43623e..c8e9336387c0738b55770b3a09cb0141b3ef47f0 100644
|
| --- a/chrome/browser/ui/search/instant_test_utils.h
|
| +++ b/chrome/browser/ui/search/instant_test_utils.h
|
| @@ -39,7 +39,8 @@ class InstantTestBase {
|
|
|
| protected:
|
| void SetupInstant(Browser* browser);
|
| - void Init(const GURL& instant_url, bool init_suggestions_url);
|
| + void Init(const GURL& instant_url, const GURL& ntp_url,
|
| + bool init_suggestions_url);
|
|
|
| void SetInstantURL(const std::string& url);
|
|
|
| @@ -66,7 +67,6 @@ class InstantTestBase {
|
| void KillInstantRenderView();
|
|
|
| void FocusOmnibox();
|
| - void FocusOmniboxAndWaitForInstantNTPSupport();
|
|
|
| void SetOmniboxText(const std::string& text);
|
|
|
| @@ -81,7 +81,6 @@ class InstantTestBase {
|
| bool GetStringFromJS(content::WebContents* contents,
|
| const std::string& script,
|
| std::string* result) WARN_UNUSED_RESULT;
|
| - bool ExecuteScript(const std::string& script) WARN_UNUSED_RESULT;
|
| bool CheckVisibilityIs(content::WebContents* contents,
|
| bool expected) WARN_UNUSED_RESULT;
|
|
|
| @@ -99,6 +98,7 @@ class InstantTestBase {
|
|
|
| private:
|
| GURL instant_url_;
|
| + GURL ntp_url_;
|
|
|
| Browser* browser_;
|
|
|
|
|