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

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

Issue 1849563005: [Sync] Add cookie jar mismatch logging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests again Created 4 years, 8 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 | « no previous file | chrome/browser/sync/test/integration/single_client_sessions_sync_test.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 0a0bc89b4a8ca89d73bdb98fc805519a0c9bb57a..133869ce440e00ae5859fb4de5cf7b3cfb5bc4b0 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/browser/signin/about_signin_internals_factory.h"
#include "chrome/browser/signin/chrome_signin_client_factory.h"
+#include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/sync/chrome_sync_client.h"
@@ -104,6 +105,7 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
DependsOn(autofill::PersonalDataManagerFactory::GetInstance());
DependsOn(BookmarkModelFactory::GetInstance());
DependsOn(ChromeSigninClientFactory::GetInstance());
+ DependsOn(GaiaCookieManagerServiceFactory::GetInstance());
#if !defined(OS_ANDROID)
DependsOn(GlobalErrorServiceFactory::GetInstance());
#endif
@@ -152,9 +154,10 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
init_params.signin_wrapper =
make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile, signin));
-
init_params.oauth2_token_service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+ init_params.gaia_cookie_manager_service =
+ GaiaCookieManagerServiceFactory::GetForProfile(profile);
// TODO(tim): Currently, AUTO/MANUAL settings refer to the *first* time sync
// is set up and *not* a browser restart for a manual-start platform (where
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698