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

Side by Side Diff: chrome/test/automation/automation_proxy.h

Issue 10836015: Convert more automation calls to the JSON interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TEST_AUTOMATION_AUTOMATION_PROXY_H_ 5 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_ 6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // Wait... function can return. 141 // Wait... function can return.
142 void SignalAppLaunch(const std::string& version_string); 142 void SignalAppLaunch(const std::string& version_string);
143 void SignalInitialLoads(); 143 void SignalInitialLoads();
144 // load_time is how long, in ms, the tab contents took to load. 144 // load_time is how long, in ms, the tab contents took to load.
145 void SignalNewTabUITab(int load_time); 145 void SignalNewTabUITab(int load_time);
146 146
147 // Gets the next extension test result in |result|. Returns false if there 147 // Gets the next extension test result in |result|. Returns false if there
148 // was a problem sending the result querying RPC. 148 // was a problem sending the result querying RPC.
149 bool GetExtensionTestResult(bool* result, std::string* message); 149 bool GetExtensionTestResult(bool* result, std::string* message);
150 150
151 // Resets to the default theme. Returns true on success.
152 bool ResetToDefaultTheme();
153
154 // Generic pattern for sending automation requests. 151 // Generic pattern for sending automation requests.
155 bool SendJSONRequest(const std::string& request, 152 bool SendJSONRequest(const std::string& request,
156 int timeout_ms, 153 int timeout_ms,
157 std::string* response) WARN_UNUSED_RESULT; 154 std::string* response) WARN_UNUSED_RESULT;
158 155
159 // Begin tracing specified categories on the browser instance. Blocks until 156 // Begin tracing specified categories on the browser instance. Blocks until
160 // browser acknowledges that tracing has begun (or failed if false is 157 // browser acknowledges that tracing has begun (or failed if false is
161 // returned). |categories| is a comma-delimited list of category wildcards. 158 // returned). |categories| is a comma-delimited list of category wildcards.
162 // A category can have an optional '-' prefix to make it an excluded category. 159 // A category can have an optional '-' prefix to make it an excluded category.
163 // Either all categories must be included or all must be excluded. 160 // Either all categories must be included or all must be excluded.
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 259
263 // Delay to let the browser execute the command. 260 // Delay to let the browser execute the command.
264 base::TimeDelta action_timeout_; 261 base::TimeDelta action_timeout_;
265 262
266 base::PlatformThreadId listener_thread_id_; 263 base::PlatformThreadId listener_thread_id_;
267 264
268 DISALLOW_COPY_AND_ASSIGN(AutomationProxy); 265 DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
269 }; 266 };
270 267
271 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_ 268 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698