Update uses of TimeDelta in chrome_frame/*. Also update a bit of TimeDelta use in webkit npapi code.

Adding robertshield for his thoughts on this.


R=ananta@chromium.org
BUG=108171


Review URL: http://codereview.chromium.org/10019015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133395 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 84 insertions, 52 deletions

diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc
index 03313d1..5f05fec 100644
--- a/chrome_frame/delete_chrome_history.cc
+++ b/chrome_frame/delete_chrome_history.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -91,7 +91,7 @@ STDMETHODIMP DeleteChromeHistory::DeleteBrowsingHistory(DWORD flags) {
     remove_mask_ |= BrowsingDataRemover::REMOVE_HISTORY;
 
   loop_.PostDelayedTask(FROM_HERE,
-      MessageLoop::QuitClosure(), 1000 * 600);
+      MessageLoop::QuitClosure(), base::TimeDelta::FromMinutes(10));
   loop_.MessageLoop::Run();
 
   return S_OK;
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index 0927ae2..94a836b 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -44,9 +44,9 @@ void MockProxyFactory::GetServerImpl(ChromeFrameAutomationProxy* pxy,
                                      void** automation_server_id) {
   *automation_server_id = proxy_id;
   loop_->PostDelayedTask(FROM_HERE,
-                         base::Bind(&LaunchDelegate::LaunchComplete,
-                                    base::Unretained(d), pxy, result),
-                         params->launch_timeout() / 2);
+      base::Bind(&LaunchDelegate::LaunchComplete,
+                 base::Unretained(d), pxy, result),
+      base::TimeDelta::FromMilliseconds(params->launch_timeout()) / 2);
 }
 
 void CFACMockTest::SetAutomationServerOk(int times) {
diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index 1f50b2e..8b553a5 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.cc
@@ -6,11 +6,12 @@
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-const int kLongWaitTimeout = 25 * 1000;
+const base::TimeDelta kLongWaitTimeout = base::TimeDelta::FromSeconds(25);
 
 TEST(ChromeFrame, Launch) {
   MessageLoopForUI loop;
-  AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);
+  AutomationMockLaunch mock_launch(&loop,
+                                   kLongWaitTimeout.InMilliseconds());
 
   loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);
 
@@ -21,7 +22,8 @@ TEST(ChromeFrame, Launch) {
 
 TEST(ChromeFrame, Navigate) {
   MessageLoopForUI loop;
-  AutomationMockNavigate mock_navigate(&loop, kLongWaitTimeout);
+  AutomationMockNavigate mock_navigate(&loop,
+                                       kLongWaitTimeout.InMilliseconds());
 
   loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);
 
@@ -32,7 +34,8 @@ TEST(ChromeFrame, Navigate) {
 
 TEST(ChromeFrame, PostMessage) {
   MessageLoopForUI loop;
-  AutomationMockPostMessage mock_postmessage(&loop, kLongWaitTimeout);
+  AutomationMockPostMessage mock_postmessage(&loop,
+                                             kLongWaitTimeout.InMilliseconds());
 
   loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);
 
@@ -43,8 +46,8 @@ TEST(ChromeFrame, PostMessage) {
 
 TEST(ChromeFrame, RequestStart) {
   MessageLoopForUI loop;
-  AutomationMockHostNetworkRequestStart mock_request_start(&loop,
-                                                           kLongWaitTimeout);
+  AutomationMockHostNetworkRequestStart mock_request_start(
+      &loop, kLongWaitTimeout.InMilliseconds());
 
   loop.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), kLongWaitTimeout);
 
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 2b7466b..1d4d479 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -217,8 +217,8 @@ class TimedMsgLoop {
   }
 
   void PostDelayedTask(const tracked_objects::Location& from_here,
-                       const base::Closure& task, int64 delay_ms) {
-    loop_.PostDelayedTask(from_here, task, delay_ms);
+                       const base::Closure& task, base::TimeDelta delay) {
+    loop_.PostDelayedTask(from_here, task, delay);
   }
 
   void Quit() {
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 10af3fd..384a58b 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -310,7 +310,8 @@ ACTION(DoCloseWindow) {
 ACTION_P(DelayDoCloseWindow, delay) {
   DCHECK(MessageLoop::current());
   MessageLoop::current()->PostDelayedTask(
-      FROM_HERE, base::Bind(DoCloseWindowNow, arg0), delay);
+      FROM_HERE, base::Bind(DoCloseWindowNow, arg0),
+      base::TimeDelta::FromMilliseconds(delay));
 }
 
 ACTION(KillChromeFrameProcesses) {
@@ -429,8 +430,8 @@ ACTION_P3(TypeUrlInAddressBar, loop, url, delay) {
       FROM_HERE,
       base::Bind(simulate_input::SendCharA, 'd', simulate_input::ALT), delay);
 
-  const unsigned int kInterval = 500;
-  int next_delay = delay + kInterval;
+  const base::TimeDelta kInterval = base::TimeDelta::FromMilliseconds(500);
+  base::TimeDelta next_delay = delay + kInterval;
 
   loop->PostDelayedTask(
       FROM_HERE, base::Bind(simulate_input::SendStringW, url), next_delay);
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index a3dd320..a61ae92 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -108,7 +108,7 @@ TEST_P(FullTabNavigationTest, Refresh) {
 
   ie_mock_.ExpectNavigation(IN_IE, GetSimplePageUrl());
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetSimplePageUrl())))
-      .WillOnce(DelayRefresh(&ie_mock_, &loop_, 0));
+      .WillOnce(DelayRefresh(&ie_mock_, &loop_, base::TimeDelta()));
 
   if (in_cf) {
     EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetSimplePageUrl())))
@@ -153,7 +153,7 @@ TEST_P(FullTabNavigationTest, DISABLED_MultipleBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page3)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoBack(&ie_mock_, &loop_, 0)));
+          DelayGoBack(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3.
   // Go back to url 1 now.
@@ -161,7 +161,7 @@ TEST_P(FullTabNavigationTest, DISABLED_MultipleBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoBack(&ie_mock_, &loop_, 0)));
+          DelayGoBack(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have reached url 1 and have 0 back & 2 forward entries for url 2 & 3.
   // Go forward to url 2 now.
@@ -169,7 +169,7 @@ TEST_P(FullTabNavigationTest, DISABLED_MultipleBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoForward(&ie_mock_, &loop_, 0)));
+          DelayGoForward(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3.
   // Go forward to url 3 now.
@@ -177,7 +177,7 @@ TEST_P(FullTabNavigationTest, DISABLED_MultipleBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoForward(&ie_mock_, &loop_, 0)));
+          DelayGoForward(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3.
   ie_mock_.ExpectNavigation(in_cf, page3);
@@ -237,7 +237,7 @@ TEST_P(FullTabNavigationTest, BackForwardAnchor) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(3))))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoBack(&ie_mock_, &loop_, 0)));
+          DelayGoBack(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We will reach anchor 2 once the navigation is complete,
   // then go back to anchor 1
@@ -247,7 +247,7 @@ TEST_P(FullTabNavigationTest, BackForwardAnchor) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(2))))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoBack(&ie_mock_, &loop_, 0)));
+          DelayGoBack(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We will reach anchor 1 once the navigation is complete,
   // now go forward to anchor 2
@@ -257,7 +257,7 @@ TEST_P(FullTabNavigationTest, BackForwardAnchor) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(1))))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoForward(&ie_mock_, &loop_, 0)));
+          DelayGoForward(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have reached anchor 2, go forward to anchor 3 again
   // Back/Forward state at this point:
@@ -266,7 +266,7 @@ TEST_P(FullTabNavigationTest, BackForwardAnchor) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(2))))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoForward(&ie_mock_, &loop_, 0)));
+          DelayGoForward(&ie_mock_, &loop_, base::TimeDelta())));
 
   // We have gone a few steps back and forward, this should be enough for now.
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(3))))
@@ -680,13 +680,13 @@ TEST_P(FullTabNavigationTest, FormPostBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kFormPostActionUrl)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoBack(&ie_mock_, &loop_, 0)));
+          DelayGoBack(&ie_mock_, &loop_, base::TimeDelta())));
 
   ie_mock_.ExpectNavigation(in_cf, kFormPostUrl);
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kFormPostUrl)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
-          DelayGoForward(&ie_mock_, &loop_, 0)));
+          DelayGoForward(&ie_mock_, &loop_, base::TimeDelta())));
 
   ie_mock_.ExpectNavigationOptionalBefore(in_cf, kFormPostActionUrl);
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kFormPostActionUrl)))
@@ -963,7 +963,8 @@ TEST_P(FullTabNavigationTest, RefreshContents) {
                                                     StrEq(src_url))));
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
       .Times(2)
-      .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50))
+      .WillOnce(DelayRefresh(
+          &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(50)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
@@ -1102,7 +1103,8 @@ TEST_F(FullTabDownloadTest, TopLevelPostReissueFromChromeFramePage) {
 
   EXPECT_CALL(ie_mock_, OnLoad(true, StrEq(tgt_url)))
       .Times(2)
-      .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50))
+      .WillOnce(DelayRefresh(
+          &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(50)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   EXPECT_CALL(ie_mock_, OnBeforeNavigate2(_,
@@ -1189,13 +1191,15 @@ TEST_P(FullTabNavigationTest, RefreshContentsUATest) {
     // As mentioned above, end the test once the refreshed document is loaded.
     EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
         .Times(2)
-        .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50))
+      .WillOnce(DelayRefresh(
+          &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(50)))
         .WillOnce(CloseBrowserMock(&ie_mock_));
   } else {
     // As mentioned above, we only receive an OnLoad for the intial load, not
     // for the refresh.
     EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
-        .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50));
+      .WillOnce(DelayRefresh(
+          &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(50)));
   }
 
   LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index aa2b516..619012c 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -669,7 +669,7 @@ void CFUrlRequestUnittestRunner::TakeDownBrowser() {
       FROM_HERE,
       base::Bind(&CFUrlRequestUnittestRunner::OnIEShutdownFailure,
                  base::Unretained(this)),
-      TestTimeouts::action_max_timeout_ms());
+      TestTimeouts::action_max_timeout());
 }
 
 void CFUrlRequestUnittestRunner::InitializeLogging() {
@@ -698,7 +698,7 @@ void CFUrlRequestUnittestRunner::StartInitializationTimeout() {
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       timeout_closure_.callback(),
-      TestTimeouts::action_max_timeout_ms());
+      TestTimeouts::action_max_timeout());
 }
 
 void CFUrlRequestUnittestRunner::OnInitializationTimeout() {
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index d6421b2..aef66e6 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -340,7 +340,7 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
 
       // TODO(beng): Can't shut down so quickly. Figure out why, and fix. If we
       // do, we crash.
-      base::PlatformThread::Sleep(50);
+      base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(50));
     }
 
     std::string times;
@@ -833,7 +833,7 @@ class ChromeFrameActiveXMemoryTest : public MemoryTestBase {
     PrintResults(test_name_.c_str());
 
     CoFreeUnusedLibraries();
-    base::PlatformThread::Sleep(100);
+    base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   }
 
   void NavigateImpl(const std::string& url) {
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index db5be8d..ea4923e 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -338,7 +338,7 @@ void ConfigurableConnection::SendChunk() {
   if (cur_pos_ < size) {
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&ConfigurableConnection::SendChunk, this),
-        options_.timeout_);
+        base::TimeDelta::FromMilliseconds(options_.timeout_));
   } else {
     socket_ = 0;  // close the connection.
   }
@@ -394,7 +394,7 @@ void ConfigurableConnection::SendWithOptions(const std::string& headers,
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, base::Bind(&ConfigurableConnection::SendChunk, this),
-      options.timeout_);
+      base::TimeDelta::FromMilliseconds(options.timeout_));
 }
 
 }  // namespace test_server
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 3efe04c..d085b8d 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -147,7 +147,7 @@ TEST_F(TestServerTest, TestServer) {
   // things start hanging.
   QuitMessageHit quit_msg(&loop);
   loop.PostDelayedTask(FROM_HERE, base::Bind(QuitMessageLoop, &quit_msg),
-                       10 * 1000);
+                       base::TimeDelta::FromSeconds(10));
 
   UrlTaskChain quit_task("http://localhost:1337/quit", NULL);
   UrlTaskChain fnf_task("http://localhost:1337/404", &quit_task);
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 52fc342..4398178 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -93,12 +93,18 @@ TEST_P(FullTabUITest, DISABLED_KeyboardBackForward) {
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::NONE)));
+          DelaySendScanCode(&loop_,
+                            base::TimeDelta::FromSeconds(1),
+                            bkspace,
+                            simulate_input::NONE)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::SHIFT)));
+          DelaySendScanCode(&loop_,
+                            base::TimeDelta::FromSeconds(1),
+                            bkspace,
+                            simulate_input::SHIFT)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
@@ -128,7 +134,10 @@ TEST_P(FullTabUITest, CtrlN) {
       .WillOnce(testing::DoAll(
           WatchWindow(&win_observer_mock, kNewWindowTitlePattern, ""),
           SetFocusToRenderer(&ie_mock_),
-          DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL)));
+          DelaySendChar(&loop_,
+                        base::TimeDelta::FromSeconds(1),
+                        'n',
+                        simulate_input::CONTROL)));
 
   // Watch for new window. It appears that the window close message cannot be
   // reliably delivered immediately upon receipt of the window open event.
@@ -165,7 +174,10 @@ TEST_P(FullTabUITest, CtrlF) {
       .WillOnce(testing::DoAll(
           WatchWindow(&win_observer_mock, kFindDialogCaption, ""),
           SetFocusToRenderer(&ie_mock_),
-          DelaySendChar(&loop_, 1500, 'f', simulate_input::CONTROL)));
+          DelaySendChar(&loop_,
+                        base::TimeDelta::FromMilliseconds(1500),
+                        'f',
+                        simulate_input::CONTROL)));
 
   EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
       .WillOnce(CloseBrowserMock(&ie_mock_));
@@ -190,8 +202,12 @@ TEST_P(FullTabUITest, CtrlR) {
       .Times(testing::AtMost(2))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendChar(&loop_, 1000, 'r', simulate_input::CONTROL),
-          DelayCloseBrowserMock(&loop_, 4000, &ie_mock_)))
+          DelaySendChar(&loop_,
+                        base::TimeDelta::FromSeconds(1),
+                        'r',
+                        simulate_input::CONTROL),
+          DelayCloseBrowserMock(
+              &loop_, base::TimeDelta::FromSeconds(4), &ie_mock_)))
       .WillRepeatedly(testing::Return());
 
   LaunchIENavigateAndLoop(GetSimplePageUrl(),
@@ -209,7 +225,10 @@ TEST_P(FullTabUITest, CtrlW) {
                                StrEq(GetSimplePageUrl())))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          DelaySendChar(&loop_, 1000, 'w', simulate_input::CONTROL)));
+          DelaySendChar(&loop_,
+                        base::TimeDelta::FromSeconds(1),
+                        'w',
+                        simulate_input::CONTROL)));
 
   LaunchIENavigateAndLoop(GetSimplePageUrl(),
                           kChromeFrameVeryLongNavigationTimeout);
@@ -226,7 +245,9 @@ TEST_P(FullTabUITest, AltD) {
                                StrEq(GetSimplePageUrl())))
       .WillOnce(testing::DoAll(
           SetFocusToRenderer(&ie_mock_),
-          TypeUrlInAddressBar(&loop_, GetLinkPageUrl(), 1500)));
+          TypeUrlInAddressBar(&loop_,
+                              GetLinkPageUrl(),
+                              base::TimeDelta::FromMilliseconds(1500))));
 
   EXPECT_CALL(ie_mock_, OnLoad(GetParam().invokes_cf(),
                                StrEq(GetLinkPageUrl())))
@@ -271,9 +292,10 @@ TEST_P(FullTabUITest, ViewSource) {
   VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
   EXPECT_CALL(ie_mock_, OnLoad(in_cf,
                                StrEq(GetSimplePageUrl())))
-      .WillOnce(DelayExecCommand(&ie_mock_, &loop_, 0, &CGID_MSHTML,
-                                 static_cast<OLECMDID>(IDM_VIEWSOURCE),
-                                 OLECMDEXECOPT_DONTPROMPTUSER, &empty, &empty));
+      .WillOnce(DelayExecCommand(
+          &ie_mock_, &loop_, base::TimeDelta(), &CGID_MSHTML,
+          static_cast<OLECMDID>(IDM_VIEWSOURCE),
+          OLECMDEXECOPT_DONTPROMPTUSER, &empty, &empty));
 
   // Expect notification for view-source window, handle new window event
   // and attach a new ie_mock_ to the received web browser
@@ -337,7 +359,8 @@ TEST_P(FullTabUITest, TabCrashReload) {
   EXPECT_CALL(prop_listener, OnChanged(DISPID_READYSTATE))
       .WillOnce(DoAll(
           ExpectDocumentReadystate(&ie_mock_, READYSTATE_UNINITIALIZED),
-          DelayNavigateToCurrentUrl(&ie_mock_, &loop_, 10)));
+          DelayNavigateToCurrentUrl(
+              &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(10))));
 
   EXPECT_CALL(ie_mock_, OnLoad(_, StrEq(GetSimplePageUrl())))
       .WillOnce(CloseBrowserMock(&ie_mock_));
@@ -371,8 +394,9 @@ TEST_P(FullTabUITest, DISABLED_TabCrashRefresh) {
       .WillOnce(DoAll(
           DisconnectDocPropNotifySink(&prop_listener),
           ExpectDocumentReadystate(&ie_mock_, READYSTATE_UNINITIALIZED),
-          DelayExecCommand(&ie_mock_, &loop_, 10, static_cast<GUID*>(NULL),
-              OLECMDID_REFRESH, 0, &empty, &empty)));
+          DelayExecCommand(
+              &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(10),
+              static_cast<GUID*>(NULL), OLECMDID_REFRESH, 0, &empty, &empty)));
 
   EXPECT_CALL(ie_mock_, OnLoad(_, StrEq(GetSimplePageUrl())))
       .WillOnce(CloseBrowserMock(&ie_mock_));