Remove action_max_timeout_ms and fix all the callers.

chrome/browser/dom_ui/bookmarks_ui_uitest.cc

Index: chrome/browser/dom_ui/bookmarks_ui_uitest.cc
diff --git a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
index 6b6ce8b2856374baa7b14b489e1c68861b2c2f3f..04c37f657c7cb2d6917052a397f12cacd87d0722 100644
--- a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
+++ b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
@@ -111,7 +111,8 @@ TEST_F(BookmarksUITest, CommandAgainGoesBackToBookmarksTab) {
 
   // Bring up the bookmarks manager tab.
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
-  ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms()));
+  ASSERT_TRUE(browser->WaitForTabToBecomeActive(
+      1, TestTimeouts::action_max_timeout_ms()));
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 
@@ -122,11 +123,13 @@ TEST_F(BookmarksUITest, CommandAgainGoesBackToBookmarksTab) {
 
   // Switch to first tab and run command again.
   ASSERT_TRUE(browser->ActivateTab(0));
-  ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms()));
+  ASSERT_TRUE(browser->WaitForTabToBecomeActive(
+      0, TestTimeouts::action_max_timeout_ms()));
   ASSERT_TRUE(browser->RunCommand(IDC_SHOW_BOOKMARK_MANAGER));
 
   // Ensure the bookmarks ui tab is active.
-  ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms()));
+  ASSERT_TRUE(browser->WaitForTabToBecomeActive(
+      1, TestTimeouts::action_max_timeout_ms()));
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 }