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

Unified Diff: chrome/browser/ui/search/instant_test_utils.h

Issue 137993020: (Try 2) InstantExtended: remove dead code related to the non-cacheable NTP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable InstantPolicyTests Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_page_unittest.cc ('k') | chrome/browser/ui/search/instant_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/browser/ui/search/instant_page_unittest.cc ('k') | chrome/browser/ui/search/instant_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698