| 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_;
|
| };
|
|
|