Merge NetworkTimeNotifier to NetworkTimeTracker

chrome/test/base/testing_browser_process.cc

 // 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.
 
 #include "chrome/test/base/testing_browser_process.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
+#include "base/time/default_tick_clock.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/chrome_apps_client.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
+#include "chrome/browser/network_time/network_time_tracker.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process_platform_part.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center.h"
 
 #if !defined(OS_IOS)
 #include "chrome/browser/notifications/notification_ui_manager.h"
@@ skipping 34 matching lines @@
   // g_browser_process must be NULL during its own destruction.
   BrowserProcess* browser_process = g_browser_process;
   g_browser_process = NULL;
   delete browser_process;
 }
 
 TestingBrowserProcess::TestingBrowserProcess()
     : notification_service_(content::NotificationService::Create()),
       module_ref_count_(0),
       app_locale_("en"),
+      network_time_tracker_(new NetworkTimeTracker(
+          scoped_ptr<base::TickClock>(new base::DefaultTickClock))),
       local_state_(NULL),
       io_thread_(NULL),
       system_request_context_(NULL),
       platform_part_(new TestingBrowserProcessPlatformPart()),
       extensions_browser_client_(
           new extensions::ChromeExtensionsBrowserClient) {
   extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
   apps::AppsClient::Set(ChromeAppsClient::GetInstance());
 }
 
@@ skipping 274 matching lines @@
 bool TestingBrowserProcess::created_local_state() const {
     return (local_state_ != NULL);
 }
 
 #if defined(ENABLE_WEBRTC)
 WebRtcLogUploader* TestingBrowserProcess::webrtc_log_uploader() {
   return NULL;
 }
 #endif
 
+NetworkTimeTracker* TestingBrowserProcess::network_time_tracker() {
+  return network_time_tracker_.get();
+}
+
 void TestingBrowserProcess::SetSystemRequestContext(
     net::URLRequestContextGetter* context_getter) {
   system_request_context_ = context_getter;
 }
 
 void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
   if (!local_state) {
     // The local_state_ PrefService is owned outside of TestingBrowserProcess,
     // but some of the members of TestingBrowserProcess hold references to it
     // (for example, via PrefNotifier members). But given our test
@@ skipping 39 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
   TestingBrowserProcess::CreateInstance();
 }
 
 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
   TestingBrowserProcess::DeleteInstance();
 }