[Sync] Add cookie jar mismatch logging

components/browser_sync/browser/profile_sync_service.h

Index: components/browser_sync/browser/profile_sync_service.h
diff --git a/components/browser_sync/browser/profile_sync_service.h b/components/browser_sync/browser/profile_sync_service.h
index 430b919a827f5117a0c0521f1cc57c47f18dc90f..9f878f8c069c6a6bde7d4993512c3583117bf25c 100644
--- a/components/browser_sync/browser/profile_sync_service.h
+++ b/components/browser_sync/browser/profile_sync_service.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ -24,6 +25,7 @@
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/signin/core/browser/gaia_cookie_manager_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_manager.h"
@@ -179,7 +181,8 @@ class ProfileSyncService : public sync_driver::SyncService,
                            public KeyedService,
                            public OAuth2TokenService::Consumer,
                            public OAuth2TokenService::Observer,
-                           public SigninManagerBase::Observer {
+                           public SigninManagerBase::Observer,
+                           public GaiaCookieManagerService::Observer {
  public:
   typedef browser_sync::SyncBackendHost::Status Status;
   typedef base::Callback<bool(void)> PlatformSyncAllowedProvider;
@@ -238,6 +241,7 @@ class ProfileSyncService : public sync_driver::SyncService,
     scoped_ptr<sync_driver::SyncClient> sync_client;
     scoped_ptr<SigninManagerWrapper> signin_wrapper;
     ProfileOAuth2TokenService* oauth2_token_service = nullptr;
+    GaiaCookieManagerService* gaia_cookie_manager_service = nullptr;
     StartBehavior start_behavior = MANUAL_START;
     syncer::NetworkTimeUpdateCallback network_time_update_callback;
     base::FilePath base_directory;
@@ -406,6 +410,11 @@ class ProfileSyncService : public sync_driver::SyncService,
   void GoogleSignedOut(const std::string& account_id,
                        const std::string& username) override;
 
+  // GaiaCookieManagerService::Observer implementation.
+  void OnGaiaAccountsInCookieUpdated(
+      const std::vector<gaia::ListedAccount>& accounts,
+      const GoogleServiceAuthError& error) override;
+
   // Get the sync status code.
   SyncStatusSummary QuerySyncStatusSummary();
 
@@ -946,6 +955,9 @@ class ProfileSyncService : public sync_driver::SyncService,
   GoogleServiceAuthError last_get_token_error_;
   base::Time next_token_request_time_;
 
+  // The gaia cookie manager.

[maxbogue, 2016/04/01 22:30:48]

This comment isn't particularly useful. Could you say something about it
managing being signed in to the content area?

[Nicolas Zea, 2016/04/04 19:57:31]

Done.

+  GaiaCookieManagerService* const gaia_cookie_manager_service_;
+
   scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
 
   // Locally owned SyncableService and ModelTypeService implementations.