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

Unified Diff: chrome/browser/sync/profile_sync_service.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: Try fixing mac bots. 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
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 48369fa8d69c16b2c42e2707a6e02664e0909d39..a4a6621d7f0448993d04048158984f9c9f17a845 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -24,6 +24,7 @@
#include "base/strings/stringprintf.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/thread_restrictions.h"
+#include "base/time/time.h"
#include "build/build_config.h"
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -205,7 +206,8 @@ ProfileSyncService::ProfileSyncService(
Profile* profile,
scoped_ptr<SigninManagerWrapper> signin_wrapper,
ProfileOAuth2TokenService* oauth2_token_service,
- ProfileSyncServiceStartBehavior start_behavior)
+ ProfileSyncServiceStartBehavior start_behavior,
+ syncer::NetworkTimeUpdateCallback network_time_update_callback)
: OAuth2TokenService::Consumer("sync"),
last_auth_error_(AuthError::AuthErrorNone()),
passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED),
@@ -215,6 +217,7 @@ ProfileSyncService::ProfileSyncService(
sync_service_url_(
GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(),
chrome::GetChannel())),
+ network_time_update_callback_(network_time_update_callback),
is_first_time_sync_configure_(false),
backend_initialized_(false),
sync_disabled_by_admin_(false),
@@ -527,27 +530,31 @@ void ProfileSyncService::InitializeBackend(bool delete_stale_data) {
SyncCredentials credentials = GetCredentials();
- scoped_refptr<net::URLRequestContextGetter> request_context_getter(
- profile_->GetRequestContext());
-
if (backend_mode_ == SYNC && delete_stale_data)
ClearStaleErrors();
- backend_->Initialize(this, sync_thread_.Pass(),
- content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::DB),
- content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::FILE),
- GetJsEventHandler(), sync_service_url_,
- local_device_->GetSyncUserAgent(), credentials,
- delete_stale_data,
- scoped_ptr<syncer::SyncManagerFactory>(
- new syncer::SyncManagerFactory(GetManagerType()))
- .Pass(),
- MakeWeakHandle(weak_factory_.GetWeakPtr()),
- base::Bind(browser_sync::ChromeReportUnrecoverableError,
- chrome::GetChannel()),
- network_resources_.get(), saved_nigori_state_.Pass());
+ SyncBackendHost::HttpPostProviderFactoryGetter
+ http_post_provider_factory_getter =
+ base::Bind(&syncer::NetworkResources::GetHttpPostProviderFactory,
+ base::Unretained(network_resources_.get()),
+ make_scoped_refptr(profile_->GetRequestContext()),
+ network_time_update_callback_);
+
+ backend_->Initialize(
+ this, sync_thread_.Pass(),
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::DB),
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::FILE),
+ GetJsEventHandler(), sync_service_url_, local_device_->GetSyncUserAgent(),
+ credentials, delete_stale_data,
+ scoped_ptr<syncer::SyncManagerFactory>(
+ new syncer::SyncManagerFactory(GetManagerType()))
+ .Pass(),
+ MakeWeakHandle(weak_factory_.GetWeakPtr()),
+ base::Bind(browser_sync::ChromeReportUnrecoverableError,
+ chrome::GetChannel()),
+ http_post_provider_factory_getter, saved_nigori_state_.Pass());
}
bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {

Powered by Google App Engine
This is Rietveld 408576698