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

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

Issue 291333009: network_time: Remove NetworkTimeService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 0755d9f1f34ab44abf2abc82fd5d501f5487cb5c..5960a0c49796a8c5ea260a9b906202683d549b50 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -68,8 +68,6 @@ 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),
@@ -365,6 +363,12 @@ WebRtcLogUploader* TestingBrowserProcess::webrtc_log_uploader() {
#endif
NetworkTimeTracker* TestingBrowserProcess::network_time_tracker() {
+ if (!network_time_tracker_) {
+ DCHECK(local_state_);
+ network_time_tracker_.reset(new NetworkTimeTracker(
+ scoped_ptr<base::TickClock>(new base::DefaultTickClock()),
+ local_state_));
+ }
return network_time_tracker_.get();
}
@@ -384,6 +388,7 @@ void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
// (assumedly as part of exiting the test and freeing TestingBrowserProcess)
// any components owned by TestingBrowserProcess that depend on local_state
// are also freed.
+ network_time_tracker_.reset();
#if !defined(OS_IOS)
notification_ui_manager_.reset();
#endif
« chrome/browser/network_time/network_time_tracker.cc ('K') | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698