Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/ui/ui_test.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_TEST_UI_UI_TEST_H_
 #define CHROME_TEST_UI_UI_TEST_H_
 #pragma once
 
 // This file provides a common base for running UI unit tests, which operate
 // the entire browser application in a separate process for holistic
 // functional testing.
 //
 // Tests should #include this file, subclass UITest, and use the TEST_F macro
 // to declare individual test cases.  This provides a running browser window
 // during the test, accessible through the window_ member variable.  The window
 // will close when the test ends, regardless of whether the test passed.
 //
 // Tests which need to launch the browser with a particular set of command-line
 // arguments should set the value of launch_arguments_ in their constructors.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process.h"
-#include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "build/build_config.h"
 // TODO(evanm): we should be able to just forward-declare
 // AutomationProxy here, but many files that #include this one don't
 // themselves #include automation_proxy.h.
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/proxy_launcher.h"
 #include "testing/platform_test.h"
 
 class AutomationProxy;
@@ skipping 17 matching lines @@
   void LaunchBrowser();
 
   // Launches the browser and IPC testing connection in server mode.
   void LaunchBrowserAndServer();
 
   // Launches the IPC testing connection in client mode,
   // which then attempts to connect to a browser.
   void ConnectToRunningBrowser();
 
   // Only for pyauto.
-  void set_command_execution_timeout_ms(int timeout);
+  int action_timeout_ms();
+  void set_action_timeout_ms(int timeout);

[Paweł Hajdan Jr., 2011/03/31 20:11:09]

This should be removed too.

 
   // Overridable so that derived classes can provide their own ProxyLauncher.
   virtual ProxyLauncher* CreateProxyLauncher();
 
   // Closes the browser and IPC testing server.
   void CloseBrowserAndServer();
 
   // Launches the browser with the given command line.
   // TODO(phajdan.jr): Make LaunchBrowser private. Tests should use
   // LaunchAnotherBrowserBlockUntilClosed.
@@ skipping 419 matching lines @@
 #ifdef UNIT_TEST
 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
 
 template<typename T>
 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
   return out << ptr.get();
 }
 #endif  // UNIT_TEST
 
 #endif  // CHROME_TEST_UI_UI_TEST_H_