Revert 124890 - Convert uses of int ms to TimeDelta in chrome/browser and net.

R=jar@chromium.org
BUG=108171


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

TBR=tedvessenes@gmail.com
Review URL: https://chromiumcodereview.appspot.com/9597005

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

11 files changed, 24 insertions, 29 deletions

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 13d5042..42b20ff 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -145,7 +145,7 @@ void CheckFocus(Browser* browser, ViewID id, const base::Time& timeout) {
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&CheckFocus, browser, id, timeout),
-        base::TimeDelta::FromMilliseconds(10));
+        10);
   }
 };
 
@@ -176,7 +176,7 @@ class BrowserFocusTest : public InProcessBrowserTest {
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&CheckFocus, browser(), vid, timeout),
-        base::TimeDelta::FromMilliseconds(100));
+        100);
     ui_test_utils::RunMessageLoop();
     return IsViewFocused(vid);
   }
@@ -225,10 +225,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) {
 #if defined(OS_POSIX)
   // It seems we have to wait a little bit for the widgets to spin up before
   // we can start clicking on them.
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      MessageLoop::QuitClosure(),
-      base::TimeDelta::FromMilliseconds(kActionDelayMs));
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          MessageLoop::QuitClosure(),
+                                          kActionDelayMs);
   ui_test_utils::RunMessageLoop();
 #endif  // defined(OS_POSIX)
 
@@ -628,7 +627,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
   // Give some time for the interstitial to show.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           MessageLoop::QuitClosure(),
-                                          base::TimeDelta::FromSeconds(1));
+                                          1000);
   ui_test_utils::RunMessageLoop();
 
   browser()->FocusLocationBar();
@@ -753,7 +752,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) {
   // Give some time for the interstitial to show.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           MessageLoop::QuitClosure(),
-                                          base::TimeDelta::FromSeconds(1));
+                                          1000);
   ui_test_utils::RunMessageLoop();
 
   // The interstitial should have focus now.
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 52c272a..a49010e 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -203,7 +203,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
       base::CancelableClosure timeout(
           base::Bind(&TimeoutCallback, "Extension load timed out."));
       MessageLoop::current()->PostDelayedTask(
-          FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(4));
+          FROM_HERE, timeout.callback(), 4 * 1000);
       extensions::UnpackedInstaller::Create(service)->Load(path);
       ui_test_utils::RunMessageLoop();
       timeout.Cancel();
@@ -226,7 +226,7 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
     base::CancelableClosure timeout(
         base::Bind(&TimeoutCallback, "Extension host load timed out."));
     MessageLoop::current()->PostDelayedTask(
-        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(4));
+        FROM_HERE, timeout.callback(), 4 * 1000);
 
     ExtensionProcessManager* manager =
           browser()->profile()->GetExtensionProcessManager();
diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc
index 08b484c..6e4706f 100644
--- a/chrome/browser/metrics/histogram_synchronizer.cc
+++ b/chrome/browser/metrics/histogram_synchronizer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 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.
 
@@ -78,7 +78,7 @@ void HistogramSynchronizer::FetchRendererHistogramsSynchronously(
 void HistogramSynchronizer::FetchRendererHistogramsAsynchronously(
     MessageLoop* callback_thread,
     const base::Closure& callback,
-    base::TimeDelta wait_time) {
+    int wait_time) {
   DCHECK(callback_thread != NULL);
   DCHECK(!callback.is_null());
 
diff --git a/chrome/browser/metrics/histogram_synchronizer.h b/chrome/browser/metrics/histogram_synchronizer.h
index af399c0..f5cdb73 100644
--- a/chrome/browser/metrics/histogram_synchronizer.h
+++ b/chrome/browser/metrics/histogram_synchronizer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 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.
 
@@ -80,7 +80,7 @@ class HistogramSynchronizer : public
   static void FetchRendererHistogramsAsynchronously(
       MessageLoop* callback_thread,
       const base::Closure& callback,
-      base::TimeDelta wait_time);
+      int wait_time);
 
   // This method is called on the IO thread. Deserializes the histograms and
   // records that we have received histograms from a renderer process.
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index a71f8c6..28ab192 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -834,7 +834,7 @@ void MetricsService::StartRecording() {
         base::Bind(&MetricsService::InitTaskGetHardwareClass,
             self_ptr_factory_.GetWeakPtr(),
             MessageLoop::current()->message_loop_proxy()),
-        base::TimeDelta::FromSeconds(kInitializationDelaySeconds));
+        kInitializationDelaySeconds);
   }
 }
 
@@ -943,7 +943,7 @@ void MetricsService::OnMemoryDetailCollectionDone() {
   // calling us back on the task.
   HistogramSynchronizer::FetchRendererHistogramsAsynchronously(
       MessageLoop::current(), callback,
-      base::TimeDelta::FromMilliseconds(kMaxHistogramGatheringWaitDuration));
+      kMaxHistogramGatheringWaitDuration);
 }
 
 void MetricsService::OnHistogramSynchronizationDone() {
diff --git a/chrome/browser/metrics/tracking_synchronizer.cc b/chrome/browser/metrics/tracking_synchronizer.cc
index e64b924..84f670c 100644
--- a/chrome/browser/metrics/tracking_synchronizer.cc
+++ b/chrome/browser/metrics/tracking_synchronizer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 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.
 
@@ -201,7 +201,7 @@ void TrackingSynchronizer::FetchProfilerDataAsynchronously(
   BrowserThread::PostDelayedTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&RequestContext::Unregister, sequence_number),
-      base::TimeDelta::FromMinutes(1));
+      60000);
 }
 
 void TrackingSynchronizer::OnPendingProcesses(int sequence_number,
diff --git a/chrome/browser/net/sqlite_origin_bound_cert_store.cc b/chrome/browser/net/sqlite_origin_bound_cert_store.cc
index 24e9f54..47bec7b 100644
--- a/chrome/browser/net/sqlite_origin_bound_cert_store.cc
+++ b/chrome/browser/net/sqlite_origin_bound_cert_store.cc
@@ -358,8 +358,7 @@ void SQLiteOriginBoundCertStore::Backend::BatchOperation(
     // We've gotten our first entry for this batch, fire off the timer.
     BrowserThread::PostDelayedTask(
         BrowserThread::DB, FROM_HERE,
-        base::Bind(&Backend::Commit, this),
-        base::TimeDelta::FromMilliseconds(kCommitIntervalMs));
+        base::Bind(&Backend::Commit, this), kCommitIntervalMs);
   } else if (num_pending == kCommitAfterBatchSize) {
     // We've reached a big enough batch, fire off a commit now.
     BrowserThread::PostTask(
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc
index d6516496..e3007c6 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc
@@ -814,8 +814,7 @@ void SQLitePersistentCookieStore::Backend::BatchOperation(
     // We've gotten our first entry for this batch, fire off the timer.
     BrowserThread::PostDelayedTask(
         BrowserThread::DB, FROM_HERE,
-        base::Bind(&Backend::Commit, this),
-        base::TimeDelta::FromMilliseconds(kCommitIntervalMs));
+        base::Bind(&Backend::Commit, this), kCommitIntervalMs);
   } else if (num_pending == kCommitAfterBatchSize) {
     // We've reached a big enough batch, fire off a commit now.
     BrowserThread::PostTask(
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc
index 4796b89..0098f1b 100644
--- a/chrome/browser/plugin_prefs.cc
+++ b/chrome/browser/plugin_prefs.cc
@@ -437,7 +437,7 @@ void PluginPrefs::SetPrefs(PrefService* prefs) {
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&PluginPrefs::GetPreferencesDataOnFileThread, this),
-        base::TimeDelta::FromMilliseconds(kPluginUpdateDelayMs));
+        kPluginUpdateDelayMs);
   }
 
   NotifyPluginStatusChanged();
diff --git a/chrome/browser/protector/settings_change_global_error.cc b/chrome/browser/protector/settings_change_global_error.cc
index cfb1d69..cbcf91b 100644
--- a/chrome/browser/protector/settings_change_global_error.cc
+++ b/chrome/browser/protector/settings_change_global_error.cc
@@ -169,7 +169,7 @@ void SettingsChangeGlobalError::OnBubbleViewDidClose(Browser* browser) {
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SettingsChangeGlobalError::OnInactiveTimeout,
                    weak_factory_.GetWeakPtr()),
-        base::TimeDelta::FromMilliseconds(kMenuItemDisplayPeriodMs));
+        kMenuItemDisplayPeriodMs);
 #if !defined(TOOLKIT_GTK)
     // TODO(ivankr): the logic for redisplaying bubble is disabled on Gtk, see
     // http://crbug.com/115719.
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 650ded2..b5f5f52 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -129,9 +129,7 @@ class SSLUITest : public InProcessBrowserTest {
 
       // Wait a bit.
       MessageLoop::current()->PostDelayedTask(
-          FROM_HERE,
-          MessageLoop::QuitClosure(),
-          base::TimeDelta::FromMilliseconds(timeout_ms));
+          FROM_HERE, MessageLoop::QuitClosure(), timeout_ms);
       ui_test_utils::RunMessageLoop();
     }
 
@@ -893,8 +891,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
   for (int i = 0; i < 10; i++) {
     if (GetConstrainedWindowCount() > 0)
       break;
-    MessageLoop::current()->PostDelayedTask(
-        FROM_HERE, MessageLoop::QuitClosure(), base::TimeDelta::FromSeconds(1));
+    MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                            MessageLoop::QuitClosure(), 1000);
     ui_test_utils::RunMessageLoop();
   }
   ASSERT_EQ(1, GetConstrainedWindowCount());