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

Unified Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 1410013008: [Sync] Remove some http-related chrome deps from SyncBackendHostImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 2 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/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 2434eff015d1911933413424823e594b02bcfb18..60b3f1db7524f5231ebb1ab38387c726ccbe1bd1 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -7,8 +7,10 @@
#include "base/command_line.h"
#include "base/memory/singleton.h"
#include "base/prefs/pref_service.h"
+#include "base/time/time.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
@@ -30,12 +32,14 @@
#include "chrome/browser/web_data_service_factory.h"
#include "chrome/common/channel_info.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/network_time/network_time_tracker.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/sync_driver/signin_manager_wrapper.h"
#include "components/sync_driver/startup_controller.h"
#include "components/sync_driver/sync_util.h"
#include "components/variations/variations_associated_data.h"
+#include "content/public/browser/browser_thread.h"
#include "url/gurl.h"
#if defined(ENABLE_EXTENSIONS)
@@ -47,6 +51,27 @@
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
#endif
+namespace {
+
+void UpdateNetworkTimeOnUIThread(base::Time network_time,
+ base::TimeDelta resolution,
+ base::TimeDelta latency,
+ base::TimeTicks post_time) {
+ g_browser_process->network_time_tracker()->UpdateNetworkTime(
+ network_time, resolution, latency, post_time);
+}
+
+void UpdateNetworkTime(const base::Time& network_time,
+ const base::TimeDelta& resolution,
+ const base::TimeDelta& latency) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::UI, FROM_HERE,
+ base::Bind(&UpdateNetworkTimeOnUIThread, network_time, resolution,
+ latency, base::TimeTicks::Now()));
+}
+
+} // anonymous namespace
+
// static
ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() {
return base::Singleton<ProfileSyncServiceFactory>::get();
@@ -161,9 +186,9 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
token_service, url_request_context_getter));
scoped_ptr<browser_sync::ChromeSyncClient> sync_client(
new browser_sync::ChromeSyncClient(profile, sync_factory.Pass()));
- ProfileSyncService* pss =
- new ProfileSyncService(sync_client.Pass(), profile, signin_wrapper.Pass(),
- token_service, behavior);
+ ProfileSyncService* pss = new ProfileSyncService(
+ sync_client.Pass(), profile, signin_wrapper.Pass(), token_service,
+ behavior, base::Bind(&UpdateNetworkTime));
pss->Initialize();
return pss;
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698