Merge NetworkTimeNotifier to NetworkTimeTracker

chrome/test/base/testing_browser_process.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.
 
 // An implementation of BrowserProcess for unit tests that fails for most
 // services. By preventing creation of services, we reduce dependencies and
 // keep the profile clean. Clients of this class must handle the NULL return
 // value, however.
 
 #ifndef CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_H_
@@ skipping 100 matching lines @@
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
   virtual component_updater::PnaclComponentInstaller*
       pnacl_component_installer() OVERRIDE;
   virtual MediaFileSystemRegistry* media_file_system_registry() OVERRIDE;
   virtual bool created_local_state() const OVERRIDE;
 
 #if defined(ENABLE_WEBRTC)
   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);
   void SetProfileManager(ProfileManager* profile_manager);
   void SetIOThread(IOThread* io_thread);
   void SetBrowserPolicyConnector(policy::BrowserPolicyConnector* connector);
   void SetSafeBrowsingService(SafeBrowsingService* sb_service);
   void SetSystemRequestContext(net::URLRequestContextGetter* context_getter);
 
  private:
@@ skipping 23 matching lines @@
 #endif
 
   scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;
   scoped_refptr<SafeBrowsingService> sb_service_;
 #endif  // !defined(OS_IOS)
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
   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_;
   net::URLRequestContextGetter* system_request_context_;
 
   scoped_ptr<BrowserProcessPlatformPart> platform_part_;
 
   scoped_ptr<extensions::ExtensionsBrowserClient> extensions_browser_client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
@@ skipping 16 matching lines @@
 class TestingBrowserProcessInitializer {
  public:
   TestingBrowserProcessInitializer();
   ~TestingBrowserProcessInitializer();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcessInitializer);
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_BROWSER_PROCESS_H_