Remove action_max_timeout_ms and fix all the callers.

chrome/test/automation/automation_proxy_uitest.cc

Index: chrome/test/automation/automation_proxy_uitest.cc
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 0d47530e9ab98c18265e0aada71f381fbb05516e..fcee17f2157fc14d9358ad7040fc1a4a235cc2ae 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -472,8 +472,8 @@ TEST_F(AutomationProxyTest, NavigateToURLAsync) {
   GURL newurl = net::FilePathToFileURL(filename);
 
   ASSERT_TRUE(tab->NavigateToURLAsync(newurl));
-  std::string value = WaitUntilCookieNonEmpty(tab.get(), newurl, "foo",
-                                              action_max_timeout_ms());
+  std::string value = WaitUntilCookieNonEmpty(
+      tab.get(), newurl, "foo", TestTimeouts::action_max_timeout_ms());
   ASSERT_STREQ("baz", value.c_str());
 }
 
@@ -650,8 +650,8 @@ TEST_F(AutomationProxyTest, BlockedPopupTest) {
 
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
-  ASSERT_TRUE(tab->WaitForBlockedPopupCountToChangeTo(2,
-                                                      action_max_timeout_ms()));
+  ASSERT_TRUE(tab->WaitForBlockedPopupCountToChangeTo(
+      2, TestTimeouts::action_max_timeout_ms()));
 }
 
 // TODO(port): Remove HWND if possible
@@ -914,7 +914,7 @@ TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) {
       .WillOnce(QUIT_LOOP(&loop));
 
   tab = mock_->CreateTabWithUrl(GURL(simple_data_url));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // Create with empty url and then navigate
@@ -938,7 +938,7 @@ TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab2) {
 
   tab = mock_->CreateTabWithUrl(GURL());
   mock_->NavigateInExternalTab(tab->handle(), GURL(simple_data_url));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // FLAKY: http://crbug.com/60409
@@ -1024,7 +1024,7 @@ TEST_F(ExternalTabUITest, FLAKY_TabPostMessage) {
   EXPECT_CALL(*mock_, HandleClosed(1)).Times(1);
 
   tab = mock_->CreateTabWithUrl(GURL(content));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // Flaky: http://crbug.com/62143
@@ -1067,7 +1067,7 @@ TEST_F(ExternalTabUITest, FLAKY_PostMessageTarget)  {
   s.load_requests_via_automation = false;
   s.initial_url = GURL("http://localhost:1337/files/post_message.html");
   tab = mock_->CreateHostWindowAndTab(s);
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // Flaky, http://crbug.com/42545.
@@ -1138,7 +1138,7 @@ TEST_F(ExternalTabUITest, FLAKY_HostNetworkStack) {
     .WillOnce(QUIT_LOOP_SOON(&loop, 300));
 
   tab = mock_->CreateTabWithUrl(GURL(url));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // Flaky, http://crbug.com/61023.
@@ -1180,7 +1180,7 @@ TEST_F(ExternalTabUITest, FLAKY_HostNetworkStackAbortRequest) {
       .WillOnce(QUIT_LOOP_SOON(&loop, 300));
 
   tab = mock_->CreateTabWithUrl(GURL(url));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 }
 
 // Flaky, http://crbug.com/61023.
@@ -1249,7 +1249,7 @@ TEST_F(ExternalTabUITest, FLAKY_HostNetworkStackUnresponsiveRenderer) {
   EXPECT_CALL(*mock_, HandleClosed(1)).Times(1);
 
   tab = mock_->CreateTabWithUrl(GURL(url));
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
   mock_->DestroyHostWindow();
 }
 
@@ -1325,7 +1325,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_WindowDotOpen) {
 
   mock_->CreateTabWithUrl(main_url);
 
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 
   EXPECT_CALL(*mock_, HandleClosed(1));
   EXPECT_CALL(*mock_, HandleClosed(2));
@@ -1365,7 +1365,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestureTargetBlank) {
       .WillOnce(QUIT_LOOP_SOON(&loop, 500));
 
   mock_->CreateTabWithUrl(main_url);
-  loop.RunFor(action_max_timeout_ms());
+  loop.RunFor(TestTimeouts::action_max_timeout_ms());
 
   EXPECT_CALL(*mock_, HandleClosed(1));
   ::DestroyWindow(foo_host);
@@ -1407,7 +1407,7 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
       browser2->GetAutocompleteEdit());
   ASSERT_TRUE(edit2.get());
   EXPECT_TRUE(browser2->GetTab(0)->WaitForTabToBeRestored(
-      action_max_timeout_ms()));
+      TestTimeouts::action_max_timeout_ms()));
   const std::wstring text_to_set1 = L"Lollerskates";
   const std::wstring text_to_set2 = L"Roflcopter";
   std::wstring actual_text1, actual_text2;
@@ -1438,7 +1438,7 @@ TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
   EXPECT_TRUE(browser->ApplyAccelerator(IDC_FOCUS_LOCATION));
   ASSERT_TRUE(edit->WaitForFocus());
   EXPECT_TRUE(edit->SetText(L"Roflcopter"));
-  EXPECT_TRUE(edit->WaitForQuery(action_max_timeout_ms()));
+  EXPECT_TRUE(edit->WaitForQuery(TestTimeouts::action_max_timeout_ms()));
   bool query_in_progress;
   EXPECT_TRUE(edit->IsQueryInProgress(&query_in_progress));
   EXPECT_FALSE(query_in_progress);