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

Side by Side Diff: chrome/test/pyautolib/pyautolib.h

Issue 6277013: Remove command_execution_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.h » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This file declares the C++ side of PyAuto, the python interface to 5 // This file declares the C++ side of PyAuto, the python interface to
6 // Chromium automation. It access Chromium's internals using Automation Proxy. 6 // Chromium automation. It access Chromium's internals using Automation Proxy.
7 7
8 #ifndef CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_ 8 #ifndef CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
9 #define CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_ 9 #define CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
10 #pragma once 10 #pragma once
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 bool SetCookie(const GURL& cookie_url, const std::string& value, 185 bool SetCookie(const GURL& cookie_url, const std::string& value,
186 int window_index = 0, int tab_index = 0); 186 int window_index = 0, int tab_index = 0);
187 // Gets a cookie value for the given url. 187 // Gets a cookie value for the given url.
188 std::string GetCookie(const GURL& cookie_url, int window_index = 0, 188 std::string GetCookie(const GURL& cookie_url, int window_index = 0,
189 int tab_index = 0); 189 int tab_index = 0);
190 190
191 int action_max_timeout_ms() const { 191 int action_max_timeout_ms() const {
192 return TestTimeouts::action_max_timeout_ms(); 192 return TestTimeouts::action_max_timeout_ms();
193 } 193 }
194 194
195 int command_execution_timeout_ms() const {
196 return TestTimeouts::command_execution_timeout_ms();
197 }
198
195 private: 199 private:
196 // Enables PostTask to main thread. 200 // Enables PostTask to main thread.
197 // Should be shared across multiple instances of PyUITestBase so that this 201 // Should be shared across multiple instances of PyUITestBase so that this
198 // class is re-entrant and multiple instances can be created. 202 // class is re-entrant and multiple instances can be created.
199 // This is necessary since python's unittest module creates instances of 203 // This is necessary since python's unittest module creates instances of
200 // TestCase at load time itself. 204 // TestCase at load time itself.
201 static MessageLoop* GetSharedMessageLoop(MessageLoop::Type msg_loop_type); 205 static MessageLoop* GetSharedMessageLoop(MessageLoop::Type msg_loop_type);
202 static MessageLoop* message_loop_; 206 static MessageLoop* message_loop_;
203 }; 207 };
204 208
205 #endif // CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_ 209 #endif // CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698