Account reconcilor: Use cookie store cookie changed subscription.

components/signin/core/browser/test_signin_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_TEST_SIGNIN_CLIENT_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_TEST_SIGNIN_CLIENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 47 matching lines @@
   // in the default constructor.
   void SetURLRequestContext(net::URLRequestContextGetter* request_context);
 
 #if defined(OS_IOS)
   virtual ios::ProfileOAuth2TokenServiceIOSProvider* GetIOSProvider() override;
 #endif
 
   // Returns true.
   bool ShouldMergeSigninCredentialsIntoCookieJar() override;
 
-  // Does nothing.
-  scoped_ptr<CookieChangedCallbackList::Subscription> AddCookieChangedCallback(
-      const CookieChangedCallback& callback) override;
+  // Registers |callback| and returns the subscription.
+  // Note that |callback| will never be called.
+  scoped_ptr<SigninClient::CookieChangedSubscription> AddCookieChangedCallback(
+      const GURL& url,
+      const std::string& name,
+      const net::CookieStore::CookieChangedCallback& callback) override;
 
 #if defined(OS_IOS)
   ios::FakeProfileOAuth2TokenServiceIOSProvider* GetIOSProviderAsFake();
 #endif
 
   // SigninClient overrides:
   void SetSigninProcess(int host_id) override;
   void ClearSigninProcess() override;
   bool IsSigninProcess(int host_id) const override;
   bool HasSigninProcess() const override;
   bool IsFirstRun() const override;
   base::Time GetInstallDate() override;
 
  private:
   // Loads the token database.
   void LoadDatabase();
 
   base::ScopedTempDir temp_dir_;
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   scoped_refptr<TokenWebData> database_;
   int signin_host_id_;
-  CookieChangedCallbackList cookie_callbacks_;
-
   PrefService* pref_service_;
 
 #if defined(OS_IOS)
   scoped_ptr<ios::FakeProfileOAuth2TokenServiceIOSProvider> iosProvider_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TestSigninClient);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_TEST_SIGNIN_CLIENT_H_