Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.

This change broke Linux and Mac bots. I would recommend to ask committers to run your next change on trybots.

(*1) http://chromegw.corp.google.com/i/chromium/builders/Mac/builds/10788/steps/compile/logs/stdio
(*2) http://chromegw.corp.google.com/i/chromium/builders/Linux/builds/19313/steps/compile/logs/stdio
(*3) http://chromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/21385/steps/compile/logs/stdio

R=brettw@chromium.org
BUG=108171
TEST=


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

TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/9215005

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

7 files changed, 24 insertions, 34 deletions

diff --git a/chrome/common/important_file_writer_unittest.cc b/chrome/common/important_file_writer_unittest.cc
index f44ce60..84d307a 100644
--- a/chrome/common/important_file_writer_unittest.cc
+++ b/chrome/common/important_file_writer_unittest.cc
@@ -75,10 +75,8 @@ TEST_F(ImportantFileWriterTest, ScheduleWrite) {
   DataSerializer serializer("foo");
   writer.ScheduleWrite(&serializer);
   EXPECT_TRUE(writer.HasPendingWrite());
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      MessageLoop::QuitClosure(),
-      base::TimeDelta::FromMilliseconds(100));
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          MessageLoop::QuitClosure(), 100);
   MessageLoop::current()->Run();
   EXPECT_FALSE(writer.HasPendingWrite());
   ASSERT_TRUE(file_util::PathExists(writer.path()));
@@ -93,10 +91,8 @@ TEST_F(ImportantFileWriterTest, DoScheduledWrite) {
   writer.ScheduleWrite(&serializer);
   EXPECT_TRUE(writer.HasPendingWrite());
   writer.DoScheduledWrite();
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      MessageLoop::QuitClosure(),
-      base::TimeDelta::FromMilliseconds(100));
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          MessageLoop::QuitClosure(), 100);
   MessageLoop::current()->Run();
   EXPECT_FALSE(writer.HasPendingWrite());
   ASSERT_TRUE(file_util::PathExists(writer.path()));
@@ -112,10 +108,8 @@ TEST_F(ImportantFileWriterTest, FLAKY_BatchingWrites) {
   writer.ScheduleWrite(&foo);
   writer.ScheduleWrite(&bar);
   writer.ScheduleWrite(&baz);
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      MessageLoop::QuitClosure(),
-      base::TimeDelta::FromMilliseconds(100));
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          MessageLoop::QuitClosure(), 100);
   MessageLoop::current()->Run();
   ASSERT_TRUE(file_util::PathExists(writer.path()));
   EXPECT_EQ("baz", GetFileContent(writer.path()));
diff --git a/chrome/common/profiling.cc b/chrome/common/profiling.cc
index e9d33f5..f355052 100644
--- a/chrome/common/profiling.cc
+++ b/chrome/common/profiling.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.
 
@@ -41,7 +41,7 @@ void FlushProfilingData(base::Thread* thread) {
     return;
 
   base::debug::FlushProfiling();
-  static int flush_seconds;
+  static int flush_seconds = 0;
   if (!flush_seconds) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     std::string profiling_flush =
@@ -54,9 +54,7 @@ void FlushProfilingData(base::Thread* thread) {
     }
   }
   thread->message_loop()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&FlushProfilingData, thread),
-      base::TimeDelta::FromSeconds(flush_seconds));
+      FROM_HERE, base::Bind(&FlushProfilingData, thread), flush_seconds * 1000);
 }
 
 class ProfilingThreadControl {
diff --git a/chrome/common/service_process_util_linux.cc b/chrome/common/service_process_util_linux.cc
index 5fb5a81..457a50c 100644
--- a/chrome/common/service_process_util_linux.cc
+++ b/chrome/common/service_process_util_linux.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.
 
@@ -31,7 +31,7 @@ MultiProcessLock* TakeNamedLock(const std::string& name, bool waiting) {
       break;
     }
     if (!waiting) break;
-    base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100 * i));
+    base::PlatformThread::Sleep(100 * i);
   }
   if (!got_lock) {
     lock.reset();
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index c8f5677..5de195d 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -185,7 +185,7 @@ TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
                                           true);
   ASSERT_TRUE(handle);
   for (int i = 0; !CheckServiceProcessReady() && i < 10; ++i) {
-    base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
+    base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
   }
   ASSERT_TRUE(CheckServiceProcessReady());
   std::string version;
@@ -228,7 +228,7 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
                                            MessageLoop::current())));
   message_loop.PostDelayedTask(FROM_HERE,
                                MessageLoop::QuitClosure(),
-                               TestTimeouts::action_max_timeout());
+                               TestTimeouts::action_max_timeout_ms());
   EXPECT_FALSE(g_good_shutdown);
   message_loop.Run();
   EXPECT_TRUE(g_good_shutdown);
@@ -274,7 +274,7 @@ class ServiceProcessStateFileManipulationTest : public ::testing::Test {
         base::Closure()));
     loop_.PostDelayedTask(FROM_HERE,
                           MessageLoop::QuitClosure(),
-                          TestTimeouts::action_max_timeout());
+                          TestTimeouts::action_max_timeout_ms());
   }
 
   const MockLaunchd* mock_launchd() const { return mock_launchd_.get(); }
diff --git a/chrome/common/worker_thread_ticker.cc b/chrome/common/worker_thread_ticker.cc
index b1dc279..391f0a3 100644
--- a/chrome/common/worker_thread_ticker.cc
+++ b/chrome/common/worker_thread_ticker.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.
 
@@ -15,7 +15,7 @@
 WorkerThreadTicker::WorkerThreadTicker(int tick_interval)
     : timer_thread_("worker_thread_ticker"),
       is_running_(false),
-      tick_interval_(base::TimeDelta::FromMilliseconds(tick_interval)) {
+      tick_interval_(tick_interval) {
 }
 
 WorkerThreadTicker::~WorkerThreadTicker() {
diff --git a/chrome/common/worker_thread_ticker.h b/chrome/common/worker_thread_ticker.h
index d009a62..dc5f542 100644
--- a/chrome/common/worker_thread_ticker.h
+++ b/chrome/common/worker_thread_ticker.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.
 
@@ -58,11 +58,11 @@ class WorkerThreadTicker {
   }
 
   void set_tick_interval(int tick_interval) {
-    tick_interval_ = base::TimeDelta::FromMilliseconds(tick_interval);
+    tick_interval_ = tick_interval;
   }
 
   int tick_interval() const {
-    return tick_interval_.InMilliseconds();
+    return tick_interval_;
   }
 
  private:
@@ -80,7 +80,7 @@ class WorkerThreadTicker {
   bool is_running_;
 
   // The interval at which the callbacks are to be invoked
-  base::TimeDelta tick_interval_;
+  int tick_interval_;
 
   // A list that holds all registered callback interfaces
   TickHandlerListType tick_handler_list_;
diff --git a/chrome/common/worker_thread_ticker_unittest.cc b/chrome/common/worker_thread_ticker_unittest.cc
index ffb0d00..b999c33 100644
--- a/chrome/common/worker_thread_ticker_unittest.cc
+++ b/chrome/common/worker_thread_ticker_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -32,15 +32,13 @@ class TestCallback : public WorkerThreadTicker::Callback {
 class LongCallback : public WorkerThreadTicker::Callback {
  public:
   virtual void OnTick() {
-    base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1500));
+    base::PlatformThread::Sleep(1500);
   }
 };
 
 void RunMessageLoopForAWhile() {
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      MessageLoop::QuitClosure(),
-      base::TimeDelta::FromMilliseconds(500));
+  MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                          MessageLoop::QuitClosure(), 500);
   MessageLoop::current()->Run();
 }