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

Unified Diff: chrome/test/ui_test_utils.h

Issue 6042009: Added WARN_UNUSED_RESULT to ScopedTempDir methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with trunk 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui_test_utils.h
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index 490239659641206620ee74e8f24d96c9e27b988c..a0deb1cbefb23c77e9a7916f1d059afb02ad33e5 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -321,12 +321,15 @@ class TimedMessageLoopRunner {
// server.
class TestWebSocketServer {
public:
- // Creates and starts a python websocket server with |root_directory|.
- explicit TestWebSocketServer(const FilePath& root_directory);
+ TestWebSocketServer();
- // Destroys and stops the server.
+ // Stops the python websocket server if it was already started.
~TestWebSocketServer();
+ // Starts the python websocket server using |root_directory|. Returns whether
+ // the server was successfully started.
+ bool Start(const FilePath& root_directory);
+
private:
// Sets up PYTHONPATH to run websocket_server.py.
void SetPythonPath();
@@ -337,6 +340,9 @@ class TestWebSocketServer {
// Creates a CommandLine for invoking the python websocker server.
CommandLine* CreateWebSocketServerCommandLine();
+ // Has the server been started?
+ bool started_;
+
// A Scoped temporary directory for holding the python pid file.
ScopedTempDir temp_dir_;
« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698