Merge NetworkTimeNotifier to NetworkTimeTracker

chrome/test/base/testing_io_thread_state.cc

 // Copyright 2013 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_io_thread_state.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
-#include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/network_time_notifier.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 52 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::NetworkHandler::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
 }
 
 void TestingIOThreadState::Initialize(const base::Closure& done) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   io_thread_state_->SetGlobalsForTesting(new IOThread::Globals());
-  io_thread_state_->globals()->network_time_notifier.reset(
-      new net::NetworkTimeNotifier(
-          scoped_ptr<base::TickClock>(new base::DefaultTickClock())));
 
   done.Run();
 }
 
 void TestingIOThreadState::Shutdown(const base::Closure& done) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   delete io_thread_state_->globals();
   io_thread_state_->SetGlobalsForTesting(NULL);
   done.Run();
 }
 
 }  // namespace chrome