Added WARN_UNUSED_RESULT to ScopedTempDir methods.

chrome/test/ui_test_utils.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 689 matching lines @@
     std::string newpath(oldpath);
     newpath.append(":");
     newpath.append(dir.value());
     setenv(kPythonPath, newpath.c_str(), 1);
   }
 #endif
 }
 
 }  // anonymous namespace
 
-TestWebSocketServer::TestWebSocketServer(const FilePath& root_directory) {
+TestWebSocketServer::TestWebSocketServer()
+    : started_(false) {

[Paweł Hajdan Jr., 2011/01/11 13:01:10]

nit: Can we fit it in the previous line?

[cbentzel, 2011/01/11 19:56:38]

Done.

+}
+
+bool TestWebSocketServer::Start(const FilePath& root_directory) {
+  if (started_)
+    return true;
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendSwitchASCII("server", "start");
   cmd_line->AppendSwitch("chromium");
   cmd_line->AppendSwitch("register_cygwin");
   cmd_line->AppendSwitchPath("root", root_directory);
-  temp_dir_.CreateUniqueTempDir();
+  if (!temp_dir_.CreateUniqueTempDir())

[Paweł Hajdan Jr., 2011/01/11 13:01:10]

LOG messages would be useful for all error cases here. Unfortunately, test
servers not starting are common.

[cbentzel, 2011/01/11 19:56:38]

Done.

+    return false;
   websocket_pid_file_ = temp_dir_.path().AppendASCII("websocket.pid");
   cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
   SetPythonPath();
-  base::LaunchApp(*cmd_line.get(), true, false, NULL);
+  if (!base::LaunchApp(*cmd_line.get(), true, false, NULL))

[Paweł Hajdan Jr., 2011/01/11 13:01:10]

nit: maybe just started_ = LaunchApp; return started_; Up to you.

[cbentzel, 2011/01/11 19:56:38]

I added a LOG in failure case, so kept the old version.

+    return false;
+  started_ = true;
+  return true;
 }
 
 CommandLine* TestWebSocketServer::CreatePythonCommandLine() {
   return new CommandLine(FilePath(FILE_PATH_LITERAL("python")));
 }
 
 void TestWebSocketServer::SetPythonPath() {
   FilePath scripts_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &scripts_path);
 
@@ skipping 16 matching lines @@
   script_path = script_path.AppendASCII("Tools");
   script_path = script_path.AppendASCII("Scripts");
   script_path = script_path.AppendASCII("new-run-webkit-websocketserver");
 
   CommandLine* cmd_line = CreatePythonCommandLine();
   cmd_line->AppendArgPath(script_path);
   return cmd_line;
 }
 
 TestWebSocketServer::~TestWebSocketServer() {
+  if (!started_)
+    return;
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendSwitchASCII("server", "stop");
   cmd_line->AppendSwitch("chromium");
   cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 }
 
 WindowedNotificationObserver::WindowedNotificationObserver(
     NotificationType notification_type,
     const NotificationSource& source)
@@ skipping 145 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils