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

Side by Side Diff: chrome/browser/ui/search/instant_test_utils.h

Issue 464483002: [Local NTP] Fix LocalNTP tests, and re-enable them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: abort test if platform doesn't support locale Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/search/local_ntp_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_UI_SEARCH_INSTANT_TEST_UTILS_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 InstantController* instant() { 55 InstantController* instant() {
56 return browser_->instant_controller()->instant(); 56 return browser_->instant_controller()->instant();
57 } 57 }
58 58
59 OmniboxView* omnibox() { 59 OmniboxView* omnibox() {
60 return browser_->window()->GetLocationBar()->GetOmniboxView(); 60 return browser_->window()->GetLocationBar()->GetOmniboxView();
61 } 61 }
62 62
63 const GURL& instant_url() const { return instant_url_; } 63 const GURL& instant_url() const { return instant_url_; }
64 64
65 const GURL& ntp_url() const { return ntp_url_; }
66
65 net::SpawnedTestServer& https_test_server() { return https_test_server_; } 67 net::SpawnedTestServer& https_test_server() { return https_test_server_; }
66 68
67 void KillInstantRenderView(); 69 void KillInstantRenderView();
68 70
69 void FocusOmnibox(); 71 void FocusOmnibox();
70 72
71 void SetOmniboxText(const std::string& text); 73 void SetOmniboxText(const std::string& text);
72 74
73 void PressEnterAndWaitForNavigation(); 75 void PressEnterAndWaitForNavigation();
74 void PressEnterAndWaitForFrameLoad(); 76 void PressEnterAndWaitForFrameLoad();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // HTTPS Testing server, started on demand. 108 // HTTPS Testing server, started on demand.
107 net::SpawnedTestServer https_test_server_; 109 net::SpawnedTestServer https_test_server_;
108 110
109 // Set to true to initialize suggestions URL in default search provider. 111 // Set to true to initialize suggestions URL in default search provider.
110 bool init_suggestions_url_; 112 bool init_suggestions_url_;
111 113
112 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); 114 DISALLOW_COPY_AND_ASSIGN(InstantTestBase);
113 }; 115 };
114 116
115 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ 117 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/search/local_ntp_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698