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

Side by Side Diff: chrome/test/ui/ui_test.h

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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) 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 #ifndef CHROME_TEST_UI_UI_TEST_H_ 5 #ifndef CHROME_TEST_UI_UI_TEST_H_
6 #define CHROME_TEST_UI_UI_TEST_H_ 6 #define CHROME_TEST_UI_UI_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 // This file provides a common base for running UI unit tests, which operate 9 // This file provides a common base for running UI unit tests, which operate
10 // the entire browser application in a separate process for holistic 10 // the entire browser application in a separate process for holistic
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // Launches the browser only. 54 // Launches the browser only.
55 void LaunchBrowser(); 55 void LaunchBrowser();
56 56
57 // Launches the browser and IPC testing connection in server mode. 57 // Launches the browser and IPC testing connection in server mode.
58 void LaunchBrowserAndServer(); 58 void LaunchBrowserAndServer();
59 59
60 // Launches the IPC testing connection in client mode, 60 // Launches the IPC testing connection in client mode,
61 // which then attempts to connect to a browser. 61 // which then attempts to connect to a browser.
62 void ConnectToRunningBrowser(); 62 void ConnectToRunningBrowser();
63 63
64 // Only for pyauto.
65 void set_command_execution_timeout_ms(int timeout);
66
67 // Overridable so that derived classes can provide their own ProxyLauncher. 64 // Overridable so that derived classes can provide their own ProxyLauncher.
68 virtual ProxyLauncher* CreateProxyLauncher(); 65 virtual ProxyLauncher* CreateProxyLauncher();
69 66
70 // Closes the browser and IPC testing server. 67 // Closes the browser and IPC testing server.
71 void CloseBrowserAndServer(); 68 void CloseBrowserAndServer();
72 69
73 // Launches the browser with the given command line. 70 // Launches the browser with the given command line.
74 // TODO(phajdan.jr): Make LaunchBrowser private. Tests should use 71 // TODO(phajdan.jr): Make LaunchBrowser private. Tests should use
75 // LaunchAnotherBrowserBlockUntilClosed. 72 // LaunchAnotherBrowserBlockUntilClosed.
76 void LaunchBrowser(const CommandLine& cmdline, bool clear_profile); 73 void LaunchBrowser(const CommandLine& cmdline, bool clear_profile);
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 #ifdef UNIT_TEST 492 #ifdef UNIT_TEST
496 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 493 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
497 494
498 template<typename T> 495 template<typename T>
499 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 496 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
500 return out << ptr.get(); 497 return out << ptr.get();
501 } 498 }
502 #endif // UNIT_TEST 499 #endif // UNIT_TEST
503 500
504 #endif // CHROME_TEST_UI_UI_TEST_H_ 501 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698