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

Unified Diff: chrome/browser/network_time/network_time_tracker_unittest.cc

Issue 291333009: network_time: Remove NetworkTimeService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests 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/browser/network_time/network_time_tracker.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/network_time/network_time_tracker_unittest.cc
diff --git a/chrome/browser/network_time/network_time_tracker_unittest.cc b/chrome/browser/network_time/network_time_tracker_unittest.cc
index 3dbe613469a9f84eaa1b85175e1aaa0d032fac85..6cd99724e1910ac641fd059b08fbe4bc8fc7d969 100644
--- a/chrome/browser/network_time/network_time_tracker_unittest.cc
+++ b/chrome/browser/network_time/network_time_tracker_unittest.cc
@@ -7,6 +7,7 @@
#include <math.h>
#include "base/compiler_specific.h"
+#include "base/prefs/testing_pref_service.h"
#include "base/time/tick_clock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -41,12 +42,17 @@ class TestTickClock : public base::TickClock {
class NetworkTimeTrackerTest : public testing::Test {
public:
- NetworkTimeTrackerTest()
- : now_(base::Time::NowFromSystemTime()),
- network_time_tracker_(new NetworkTimeTracker(
- scoped_ptr<base::TickClock>(new TestTickClock(&ticks_now_)))) {}
virtual ~NetworkTimeTrackerTest() {}
+ virtual void SetUp() OVERRIDE {
+ NetworkTimeTracker::RegisterPrefs(pref_service_.registry());
+
+ now_ = base::Time::NowFromSystemTime();
+ network_time_tracker_.reset(new NetworkTimeTracker(
+ scoped_ptr<base::TickClock>(new TestTickClock(&ticks_now_)),
+ &pref_service_));
+ }
+
base::Time Now() const {
return now_ + (ticks_now_ - base::TimeTicks());
}
@@ -98,6 +104,8 @@ class NetworkTimeTrackerTest : public testing::Test {
base::Time now_;
base::TimeTicks ticks_now_;
+ TestingPrefServiceSimple pref_service_;
+
// The network time tracker being tested.
scoped_ptr<NetworkTimeTracker> network_time_tracker_;
};
« no previous file with comments | « chrome/browser/network_time/network_time_tracker.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698