OLD | NEW |
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 64 |
65 net::SpawnedTestServer& https_test_server() { return https_test_server_; } | 65 net::SpawnedTestServer& https_test_server() { return https_test_server_; } |
66 | 66 |
67 void KillInstantRenderView(); | 67 void KillInstantRenderView(); |
68 | 68 |
69 void FocusOmnibox(); | 69 void FocusOmnibox(); |
70 | 70 |
71 void SetOmniboxText(const std::string& text); | 71 void SetOmniboxText(const std::string& text); |
72 | 72 |
73 void PressEnterAndWaitForNavigation(); | 73 void PressEnterAndWaitForNavigation(); |
| 74 void PressEnterAndWaitForFrameLoad(); |
74 | 75 |
75 bool GetBoolFromJS(content::WebContents* contents, | 76 bool GetBoolFromJS(content::WebContents* contents, |
76 const std::string& script, | 77 const std::string& script, |
77 bool* result) WARN_UNUSED_RESULT; | 78 bool* result) WARN_UNUSED_RESULT; |
78 bool GetIntFromJS(content::WebContents* contents, | 79 bool GetIntFromJS(content::WebContents* contents, |
79 const std::string& script, | 80 const std::string& script, |
80 int* result) WARN_UNUSED_RESULT; | 81 int* result) WARN_UNUSED_RESULT; |
81 bool GetStringFromJS(content::WebContents* contents, | 82 bool GetStringFromJS(content::WebContents* contents, |
82 const std::string& script, | 83 const std::string& script, |
83 std::string* result) WARN_UNUSED_RESULT; | 84 std::string* result) WARN_UNUSED_RESULT; |
(...skipping 21 matching lines...) Expand all Loading... |
105 // HTTPS Testing server, started on demand. | 106 // HTTPS Testing server, started on demand. |
106 net::SpawnedTestServer https_test_server_; | 107 net::SpawnedTestServer https_test_server_; |
107 | 108 |
108 // Set to true to initialize suggestions URL in default search provider. | 109 // Set to true to initialize suggestions URL in default search provider. |
109 bool init_suggestions_url_; | 110 bool init_suggestions_url_; |
110 | 111 |
111 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); | 112 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); |
112 }; | 113 }; |
113 | 114 |
114 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ | 115 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
OLD | NEW |