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

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

Issue 7519028: Remove some unneeded uses of wstring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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/test/automation/proxy_launcher.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 (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_AUTOMATION_PROXY_LAUNCHER_H_ 5 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
6 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ 6 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #endif 101 #endif
102 102
103 // Exits out of browser instance. 103 // Exits out of browser instance.
104 void QuitBrowser(); 104 void QuitBrowser();
105 105
106 // Terminates the browser, simulates end of session. 106 // Terminates the browser, simulates end of session.
107 void TerminateBrowser(); 107 void TerminateBrowser();
108 108
109 // Check that no processes related to Chrome exist, displaying 109 // Check that no processes related to Chrome exist, displaying
110 // the given message if any do. 110 // the given message if any do.
111 void AssertAppNotRunning(const std::wstring& error_message); 111 void AssertAppNotRunning(const std::string& error_message);
112 112
113 // Wait for the browser process to shut down on its own (i.e. as a result of 113 // Wait for the browser process to shut down on its own (i.e. as a result of
114 // some action that your test has taken). If it has exited within |timeout|, 114 // some action that your test has taken). If it has exited within |timeout|,
115 // puts the exit code in |exit_code| and returns true. 115 // puts the exit code in |exit_code| and returns true.
116 bool WaitForBrowserProcessToQuit(int timeout, int* exit_code); 116 bool WaitForBrowserProcessToQuit(int timeout, int* exit_code);
117 117
118 AutomationProxy* automation() const; 118 AutomationProxy* automation() const;
119 119
120 // Return the user data directory being used by the browser instance. 120 // Return the user data directory being used by the browser instance.
121 FilePath user_data_dir() const; 121 FilePath user_data_dir() const;
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 protected: 315 protected:
316 std::string channel_id_; // Channel id of automation proxy. 316 std::string channel_id_; // Channel id of automation proxy.
317 bool disconnect_on_failure_; // True if we disconnect on IPC channel failure. 317 bool disconnect_on_failure_; // True if we disconnect on IPC channel failure.
318 318
319 private: 319 private:
320 DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher); 320 DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher);
321 }; 321 };
322 322
323 #endif // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ 323 #endif // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/automation/proxy_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698