Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1212)

Unified Diff: chrome/test/base/testing_io_thread_state.cc

Issue 271853004: Merge NetworkTimeNotifier to NetworkTimeTracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/testing_browser_process.cc ('k') | net/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_io_thread_state.cc
diff --git a/chrome/test/base/testing_io_thread_state.cc b/chrome/test/base/testing_io_thread_state.cc
index 46f396afd38de14ca370dad5f5b7fe025790b46a..759d463c52da05065f701f28ab842db37ee8f570 100644
--- a/chrome/test/base/testing_io_thread_state.cc
+++ b/chrome/test/base/testing_io_thread_state.cc
@@ -6,12 +6,10 @@
#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"
@@ -84,9 +82,6 @@ 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();
}
« no previous file with comments | « chrome/test/base/testing_browser_process.cc ('k') | net/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698