Switch to TimeDelta interfaces for TestTimeouts in sync code.

chrome/browser/sync/glue/session_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 202 matching lines @@
   bool ShouldSyncTab(const SyncedTabDelegate& tab) const;
 
   // Compare |urls| against |tab_map_|'s urls to see if any tabs with
   // outstanding favicon loads can be fulfilled.
   void FaviconsUpdated(const std::set<GURL>& urls);
 
   // Returns the syncable model type.
   static syncer::ModelType model_type() { return syncer::SESSIONS; }
 
   // Testing only. Will cause the associator to call MessageLoop::Quit()
-  // when a local change is made, or when timeout_milli occurs, whichever is
+  // when a local change is made, or when timeout occurs, whichever is
   // first.
-  void BlockUntilLocalChangeForTest(int64 timeout_milli);
+  void BlockUntilLocalChangeForTest(base::TimeDelta timeout);
 
   // Callback for when the session name has been computed.
   void OnSessionNameInitialized(const std::string& name);
 
   // If a valid favicon for the page at |url| is found, fills |png_favicon| with
   // the png-encoded image and returns true. Else, returns false.
   bool GetSyncedFaviconForPageURL(const std::string& url,
                                   std::string* png_favicon) const;
 
  private:
@@ skipping 322 matching lines @@
   std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
   // Map of page URL -> favicon url.
   std::map<std::string, std::string> synced_favicon_pages_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_