Merge NetworkTimeNotifier to NetworkTimeTracker

chrome/test/base/testing_browser_process.h

Index: chrome/test/base/testing_browser_process.h
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index f15227ae5f8d65ea896f01d00aa57245399e5d8a..3ecdf479a1b54e2e963391335aa05c3e6d1e64f1 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -118,6 +118,8 @@ class TestingBrowserProcess : public BrowserProcess {
   virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
 #endif
 
+  virtual NetworkTimeTracker* network_time_tracker() OVERRIDE;
+
   // Set the local state for tests. Consumer is responsible for cleaning it up
   // afterwards (using ScopedTestingLocalState, for example).
   void SetLocalState(PrefService* local_state);
@@ -161,6 +163,8 @@ class TestingBrowserProcess : public BrowserProcess {
   scoped_ptr<MediaFileSystemRegistry> media_file_system_registry_;
 #endif
 
+  scoped_ptr<NetworkTimeTracker> network_time_tracker_;
+
   // The following objects are not owned by TestingBrowserProcess:
   PrefService* local_state_;
   IOThread* io_thread_;