Remove action_max_timeout_ms and fix all the callers.

chrome/browser/extensions/extension_uitest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/automation/automation_proxy_uitest.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui_test_utils.h"
@@ skipping 119 matching lines @@
         SaveArg<0>(&message_received),
         InvokeWithoutArgs(
             CreateFunctor(&loop_, &TimedMessageLoopRunner::Quit))));
 
   EXPECT_CALL(*mock_, HandleClosed(_));
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_->NavigateInExternalTab(
       GURL("chrome-extension://pmgpglkggjdpkpghhdmbdhababjpcohk/test.html"),
       GURL("")));
 
-  loop_.RunFor(action_max_timeout_ms());
+  loop_.RunFor(TestTimeouts::action_max_timeout_ms());
   ASSERT_FALSE(message_received.empty());
 
   scoped_ptr<Value> message_value(base::JSONReader::Read(message_received,
                                                          false));
   ASSERT_TRUE(message_value->IsType(Value::TYPE_DICTIONARY));
   DictionaryValue* message_dict =
       reinterpret_cast<DictionaryValue*>(message_value.get());
   std::string result;
   ASSERT_TRUE(message_dict->GetString(keys::kAutomationNameKey, &result));
   EXPECT_EQ("tabs.remove", result);
@@ skipping 132 matching lines @@
             &ExtensionTestRoundtripApiCall::CheckAndSendResponse))));
 
   EXPECT_CALL(*mock_, HandleClosed(_));
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_->NavigateInExternalTab(
     GURL("chrome-extension://ofoknjclcmghjfmbncljcnpjmfmldhno/test.html"),
     GURL("")));
 
   // CheckAndSendResponse (called by OnForwardMessageToExternalHost)
   // will end the loop once it has received both of our expected messages.
-  loop_.RunFor(action_max_timeout_ms());
+  loop_.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 class ExtensionTestBrowserEvents : public ExtensionUITest {
  public:
   ExtensionTestBrowserEvents()
     : ExtensionUITest(kTestDirectoryBrowserEvent),
       response_count_(0) {
   }
 
   void SetUp() {
@@ skipping 166 matching lines @@
             &ExtensionTestBrowserEvents::HandleMessageFromChrome))));
 
   EXPECT_CALL(*mock_, HandleClosed(_));
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_->NavigateInExternalTab(
     GURL("chrome-extension://ofoknjclcmghjfmbncljcnpjmfmldhno/test.html"),
     GURL("")));
 
   // HandleMessageFromChrome (called by OnForwardMessageToExternalHost) ends
   // the loop when we've received the number of response messages we expect.
-  loop_.RunFor(action_max_timeout_ms());
+  loop_.RunFor(TestTimeouts::action_max_timeout_ms());
 
   // If this assert hits and the actual size is 0 then you need to look at:
   // src\chrome\test\data\extensions\uitest\event_sink\test.html and see if
   // all the events we are attaching to are valid. Also compare the list against
   // the event_names_ string array above.
   ASSERT_EQ(arraysize(events_), event_count_.size());
   for (std::map<std::string, int>::iterator i = event_count_.begin();
       i != event_count_.end(); ++i) {
     const std::pair<std::string, int>& value = *i;
     EXPECT_EQ(1, value.second);
   }
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace