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

chrome/browser/metrics/histogram_synchronizer.h

-// 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.
 
 #ifndef CHROME_BROWSER_METRICS_HISTOGRAM_SYNCHRONIZER_H_
 #define CHROME_BROWSER_METRICS_HISTOGRAM_SYNCHRONIZER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
@@ skipping 61 matching lines @@
   // main UI thread from about:histograms.
   void FetchRendererHistogramsSynchronously(base::TimeDelta wait_time);
 
   // Contact all renderers, and get them to upload to the browser any/all
   // changes to histograms.  When all changes have been acquired, or when the
   // wait time expires (whichever is sooner), post the callback to the
   // specified message loop. Note the callback is posted exactly once.
   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.
   static void DeserializeHistogramList(
       int sequence_number, const std::vector<std::string>& histograms);
 
  private:
   friend class base::RefCountedThreadSafe<HistogramSynchronizer>;
 
   ~HistogramSynchronizer();
@@ skipping 78 matching lines @@
   // portion of main(). It initializes globals to provide support for all future
   // calls. This object is created on the UI thread, and it is destroyed after
   // all the other threads have gone away. As a result, it is ok to call it
   // from the UI thread (for UMA uploads), or for about:histograms.
   static HistogramSynchronizer* histogram_synchronizer_;
 
   DISALLOW_COPY_AND_ASSIGN(HistogramSynchronizer);
 };
 
 #endif  // CHROME_BROWSER_METRICS_HISTOGRAM_SYNCHRONIZER_H_