4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc
index 6e4706f..08b484c 100644
--- a/chrome/browser/metrics/histogram_synchronizer.cc
+++ b/chrome/browser/metrics/histogram_synchronizer.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.
 
@@ -78,7 +78,7 @@ void HistogramSynchronizer::FetchRendererHistogramsSynchronously(
 void HistogramSynchronizer::FetchRendererHistogramsAsynchronously(
     MessageLoop* callback_thread,
     const base::Closure& callback,
-    int wait_time) {
+    base::TimeDelta 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 f5cdb73..af399c0 100644
--- a/chrome/browser/metrics/histogram_synchronizer.h
+++ b/chrome/browser/metrics/histogram_synchronizer.h
@@ -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.
 
@@ -80,7 +80,7 @@ class HistogramSynchronizer : public
   static void FetchRendererHistogramsAsynchronously(
       MessageLoop* callback_thread,
       const base::Closure& callback,
-      int wait_time);
+      base::TimeDelta 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 28ab192..a71f8c6 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()),
-        kInitializationDelaySeconds);
+        base::TimeDelta::FromSeconds(kInitializationDelaySeconds));
   }
 }
 
@@ -943,7 +943,7 @@ void MetricsService::OnMemoryDetailCollectionDone() {
   // calling us back on the task.
   HistogramSynchronizer::FetchRendererHistogramsAsynchronously(
       MessageLoop::current(), callback,
-      kMaxHistogramGatheringWaitDuration);
+      base::TimeDelta::FromMilliseconds(kMaxHistogramGatheringWaitDuration));
 }
 
 void MetricsService::OnHistogramSynchronizationDone() {
diff --git a/chrome/browser/metrics/tracking_synchronizer.cc b/chrome/browser/metrics/tracking_synchronizer.cc
index 84f670c..e64b924 100644
--- a/chrome/browser/metrics/tracking_synchronizer.cc
+++ b/chrome/browser/metrics/tracking_synchronizer.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.
 
@@ -201,7 +201,7 @@ void TrackingSynchronizer::FetchProfilerDataAsynchronously(
   BrowserThread::PostDelayedTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&RequestContext::Unregister, sequence_number),
-      60000);
+      base::TimeDelta::FromMinutes(1));
 }
 
 void TrackingSynchronizer::OnPendingProcesses(int sequence_number,