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

Unified Diff: chrome/browser/upgrade_detector_impl.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/browser/upgrade_detector_impl.h ('k') | chrome/test/base/testing_browser_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/upgrade_detector_impl.cc
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 0790e0861d63a13a153718d41d618b251721d052..80f9361522f8600160462bae8a57522815f32989 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -23,6 +23,7 @@
#include "base/version.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/google/google_util.h"
+#include "chrome/browser/network_time/network_time_tracker.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/pref_names.h"
@@ -246,8 +247,6 @@ UpgradeDetectorImpl::UpgradeDetectorImpl()
start_upgrade_check_timer_task,
&is_unstable_channel_));
#endif
- // Start tracking network time updates.
- network_time_tracker_.Start();
}
UpgradeDetectorImpl::~UpgradeDetectorImpl() {
@@ -378,9 +377,8 @@ bool UpgradeDetectorImpl::DetectOutdatedInstall() {
base::Time network_time;
base::TimeDelta uncertainty;
- if (!network_time_tracker_.GetNetworkTime(base::TimeTicks::Now(),
- &network_time,
- &uncertainty)) {
+ if (!g_browser_process->network_time_tracker()->GetNetworkTime(
+ base::TimeTicks::Now(), &network_time, &uncertainty)) {
// When network time has not been initialized yet, simply rely on the
// machine's current time.
network_time = base::Time::Now();
« no previous file with comments | « chrome/browser/upgrade_detector_impl.h ('k') | chrome/test/base/testing_browser_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698