Account reconcilor: Use cookie store cookie changed subscription.

components/signin/core/browser/test_signin_client.cc

 // 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.
 
 #include "base/logging.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/core/browser/webdata/token_service_table.h"
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_database_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 61 matching lines @@
                                base::MessageLoopProxy::current(),
                                base::MessageLoopProxy::current(),
                                WebDataServiceBase::ProfileErrorCallback());
   database_->Init();
 }
 
 bool TestSigninClient::ShouldMergeSigninCredentialsIntoCookieJar() {
   return true;
 }
 
-scoped_ptr<SigninClient::CookieChangedCallbackList::Subscription>
+scoped_ptr<SigninClient::CookieChangedSubscription>
 TestSigninClient::AddCookieChangedCallback(
-    const SigninClient::CookieChangedCallback& callback) {
-  return cookie_callbacks_.Add(callback);
+    const GURL& url,
+    const std::string& name,
+    const net::CookieStore::CookieChangedCallback& callback) {
+  return scoped_ptr<SigninClient::CookieChangedSubscription>(
+      new SigninClient::CookieChangedSubscription);
 }
 
 #if defined(OS_IOS)
 ios::ProfileOAuth2TokenServiceIOSProvider* TestSigninClient::GetIOSProvider() {
   return GetIOSProviderAsFake();
 }
 
 ios::FakeProfileOAuth2TokenServiceIOSProvider*
 TestSigninClient::GetIOSProviderAsFake() {
   if (!iosProvider_) {
@@ skipping 23 matching lines @@
   return signin_host_id_ != kInvalidProcessId;
 }
 
 bool TestSigninClient::IsFirstRun() const {
   return false;
 }
 
 base::Time TestSigninClient::GetInstallDate() {
   return base::Time::Now();
 }