Remove references to GaiaConstants::kSyncService from sync

This CL is followup after https://codereview.chromium.org/22342003/

I've removed references to GaiaConstants::kSyncService from
ProfileSyncService unittests, SyncBackendHost and ProfileSyncService.java

There are still references in TokenService, TokenService unittests and
chrome/browser/chromeos/login/online_attempt.cc. The last one should not
block TokenService  migration as it doesn't refer TokenService, but
I don't understand that code so decided not to change it.

Review URL: https://codereview.chromium.org/31213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230899 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 0 insertions, 108 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 774d02d..4ebfac9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -511,8 +511,6 @@ public class ProfileSyncService {
     private native void nativeDisableSync(int nativeProfileSyncServiceAndroid);
     private native void nativeSignInSync(int nativeProfileSyncServiceAndroid);
     private native void nativeSignOutSync(int nativeProfileSyncServiceAndroid);
-    private native void nativeTokenAvailable(
-            int nativeProfileSyncServiceAndroid, String username, String authToken);
     private native boolean nativeSetSyncSessionsId(int nativeProfileSyncServiceAndroid, String tag);
     private native String nativeQuerySyncStatusSummary(int nativeProfileSyncServiceAndroid);
     private native int nativeGetAuthError(int nativeProfileSyncServiceAndroid);
diff --git a/chrome/browser/resources/sync_internals/chrome_sync.js b/chrome/browser/resources/sync_internals/chrome_sync.js
index 4b55afb..8867c62 100644
--- a/chrome/browser/resources/sync_internals/chrome_sync.js
+++ b/chrome/browser/resources/sync_internals/chrome_sync.js
@@ -85,7 +85,6 @@ chrome.sync.events = {
     'onChangesComplete',
     'onSyncCycleCompleted',
     'onConnectionStatusChange',
-    'onUpdatedToken',
     'onPassphraseRequired',
     'onPassphraseAccepted',
     'onInitializationComplete',
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 18cde29..0c7c3b3 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -128,7 +128,6 @@ class SyncBackendHost::Core
   virtual void OnConnectionStatusChange(
       syncer::ConnectionStatus status) OVERRIDE;
   virtual void OnStopSyncingPermanently() OVERRIDE;
-  virtual void OnUpdatedToken(const std::string& token) OVERRIDE;
   virtual void OnActionableError(
       const syncer::SyncProtocolError& sync_error) OVERRIDE;
 
@@ -1037,15 +1036,6 @@ void SyncBackendHost::Core::OnStopSyncingPermanently() {
       &SyncBackendHost::HandleStopSyncingPermanentlyOnFrontendLoop);
 }
 
-void SyncBackendHost::Core::OnUpdatedToken(const std::string& token) {
-  if (!sync_loop_)
-    return;
-  DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
-  host_.Call(
-      FROM_HERE,
-      &SyncBackendHost::NotifyUpdatedToken, token);
-}
-
 void SyncBackendHost::Core::OnEncryptedTypesChanged(
     syncer::ModelTypeSet encrypted_types,
     bool encrypt_everything) {
@@ -1563,15 +1553,6 @@ void SyncBackendHost::NotifyPassphraseAccepted() {
   frontend_->OnPassphraseAccepted();
 }
 
-void SyncBackendHost::NotifyUpdatedToken(const std::string& token) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  TokenAvailableDetails details(GaiaConstants::kSyncService, token);
-
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
-  CHECK(token_service);
-  token_service->AddAuthTokenManually(details.service(), details.token());
-}
-
 void SyncBackendHost::NotifyEncryptedTypesChanged(
     syncer::ModelTypeSet encrypted_types,
     bool encrypt_everything) {
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 9920578..0480e96 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -466,9 +466,6 @@ class SyncBackendHost
   // Invoked when the passphrase provided by the user has been accepted.
   void NotifyPassphraseAccepted();
 
-  // Invoked when an updated token is available from the sync server.
-  void NotifyUpdatedToken(const std::string& token);
-
   // Invoked when the set of encrypted types or the encrypt
   // everything flag changes.
   void NotifyEncryptedTypesChanged(
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index ec7d507..0ab68f2 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -19,8 +19,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/signin/token_service.h"
-#include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -32,7 +30,6 @@
 #include "google/cacheinvalidation/types.pb.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "google_apis/gaia/oauth2_token_service.h"
 #include "grit/generated_resources.h"
 #include "jni/ProfileSyncService_jni.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ -135,13 +132,6 @@ void ProfileSyncServiceAndroid::OnStateChanged() {
       env, weak_java_profile_sync_service_.get(env).obj());
 }
 
-void ProfileSyncServiceAndroid::TokenAvailable(
-    JNIEnv* env, jobject, jstring username, jstring auth_token) {
-  std::string token = ConvertJavaStringToUTF8(env, auth_token);
-  TokenServiceFactory::GetForProfile(profile_)->OnIssueAuthTokenSuccess(
-      GaiaConstants::kSyncService, token);
-}
-
 void ProfileSyncServiceAndroid::EnableSync(JNIEnv* env, jobject) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Don't need to do anything if we're already enabled.
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index 19ec2a3..5af9cd8 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -47,8 +47,6 @@ class ProfileSyncServiceAndroid : public ProfileSyncServiceObserver {
   // which types have changed.
   void NudgeSyncerForAllTypes(JNIEnv* env, jobject obj);
 
-  void TokenAvailable(JNIEnv*, jobject, jstring username, jstring auth_token);
-
   // Called from Java when the user manually enables sync
   void EnableSync(JNIEnv* env, jobject obj);
 
diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
index 61b9e7e..56e25fd 100644
--- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
@@ -592,7 +592,6 @@ class ProfileSyncServiceAutofillTest
     // We need tokens to get the tests going
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
         ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
-    token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
 
     sync_service_->RegisterDataTypeController(data_type_controller);
     sync_service_->Initialize();
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index f156fdd..800d1bb 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -209,8 +209,6 @@ bool ProfileSyncServiceHarness::SetupSync(
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
   TokenServiceFactory::GetForProfile(profile_)->IssueAuthTokenForTest(
       GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
-  TokenServiceFactory::GetForProfile(profile_)->IssueAuthTokenForTest(
-      GaiaConstants::kSyncService, "sync_token");
 
   // Wait for the OnBackendInitialized() callback.
   if (!AwaitBackendInitialized()) {
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index e10844d..ecf25b9 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -236,8 +236,6 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
       // We need tokens to get the tests going
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
           ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
-      token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService,
-                                            "token");
 
       sync_service_->RegisterDataTypeController(data_type_controller);
       sync_service_->Initialize();
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index b3683bf..4c352a6 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -187,8 +187,6 @@ class ProfileSyncServicePreferenceTest
     sync_service_->RegisterDataTypeController(dtc_);
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
         ->UpdateCredentials("test", "oauth2_login_token");
-    TokenServiceFactory::GetForProfile(profile_.get())
-        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
 
     sync_service_->Initialize();
     base::MessageLoop::current()->Run();
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 5924cd95..f5829d5 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -222,8 +222,6 @@ class ProfileSyncServiceSessionTest
 
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile())
         ->UpdateCredentials("test_user", "oauth2_login_token");
-    TokenServiceFactory::GetForProfile(profile())
-        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
     sync_service_->Initialize();
     base::MessageLoop::current()->Run();
     return true;
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index 8a1b6a1..e61f098 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -141,8 +141,6 @@ class ProfileSyncServiceStartupTest : public testing::Test {
   void IssueTestTokens() {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
         ->UpdateCredentials("test_user@gmail.com", "oauth2_login_token");
-    TokenServiceFactory::GetForProfile(profile_.get())
-        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   }
 
  protected:
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index 9a0abbb..743f249 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -241,8 +241,6 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
       ProfileOAuth2TokenService* oauth2_token_service =
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
       oauth2_token_service->UpdateCredentials("test", "oauth2_login_token");
-      token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService,
-                                            "token");
 
       sync_service_->RegisterDataTypeController(data_type_controller);
 
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 1899863..18deb39 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -149,8 +149,6 @@ class ProfileSyncServiceTest : public testing::Test {
   void IssueTestTokens() {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
         ->UpdateCredentials("test", "oauth2_login_token");
-    TokenServiceFactory::GetForProfile(profile_.get())
-        ->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
   }
 
   scoped_ptr<TestProfileSyncService> service_;
diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc
index af3d4fc..e5f5124 100644
--- a/sync/engine/all_status.cc
+++ b/sync/engine/all_status.cc
@@ -101,7 +101,6 @@ void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) {
       status_ = CalcSyncing(event);
       break;
     case SyncEngineEvent::STOP_SYNCING_PERMANENTLY:
-    case SyncEngineEvent::UPDATED_TOKEN:
        break;
     case SyncEngineEvent::ACTIONABLE_ERROR:
       status_ = CreateBlankStatus();
diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h
index 6f29b91..e6a48f0 100644
--- a/sync/engine/net/server_connection_manager.h
+++ b/sync/engine/net/server_connection_manager.h
@@ -81,9 +81,6 @@ struct SYNC_EXPORT_PRIVATE HttpResponse {
   // The size of a download request's payload.
   int64 payload_length;
 
-  // Value of the Update-Client-Auth header.
-  std::string update_client_auth_header;
-
   // Identifies the type of failure, if any.
   ServerConnectionCode server_status;
 
diff --git a/sync/engine/sync_engine_event.h b/sync/engine/sync_engine_event.h
index 3328ff3..25f9692 100644
--- a/sync/engine/sync_engine_event.h
+++ b/sync/engine/sync_engine_event.h
@@ -32,9 +32,6 @@ struct SYNC_EXPORT_PRIVATE SyncEngineEvent {
     ////////////////////////////////////////////////////////////////
     // Generated in response to specific protocol actions or events.
 
-    // New token in updated_token.
-    UPDATED_TOKEN,
-
     // This is sent after the Syncer (and SyncerThread) have initiated self
     // halt due to no longer being permitted to communicate with the server.
     // The listener should sever the sync / browser connections and delete sync
diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc
index 863a8c4..bfd8151 100644
--- a/sync/engine/syncer_proto_util.cc
+++ b/sync/engine/syncer_proto_util.cc
@@ -276,13 +276,6 @@ bool SyncerProtoUtil::PostAndProcessHeaders(ServerConnectionManager* scm,
     return false;
   }
 
-  std::string new_token = params.response.update_client_auth_header;
-  if (!new_token.empty()) {
-    SyncEngineEvent event(SyncEngineEvent::UPDATED_TOKEN);
-    event.updated_token = new_token;
-    session->context()->NotifyListeners(event);
-  }
-
   if (response->ParseFromString(params.buffer_out)) {
     // TODO(tim): This is an egregious layering violation (bug 35060).
     switch (response->error_code()) {
diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc
index 222fa23d..7875ed9 100644
--- a/sync/internal_api/debug_info_event_listener.cc
+++ b/sync/internal_api/debug_info_event_listener.cc
@@ -89,11 +89,6 @@ void DebugInfoEventListener::OnStopSyncingPermanently() {
   CreateAndAddEvent(sync_pb::DebugEventInfo::STOP_SYNCING_PERMANENTLY);
 }
 
-void DebugInfoEventListener::OnUpdatedToken(const std::string& token) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  CreateAndAddEvent(sync_pb::DebugEventInfo::UPDATED_TOKEN);
-}
-
 void DebugInfoEventListener::OnEncryptedTypesChanged(
     ModelTypeSet encrypted_types,
     bool encrypt_everything) {
diff --git a/sync/internal_api/debug_info_event_listener.h b/sync/internal_api/debug_info_event_listener.h
index b0c079e..b7a187a 100644
--- a/sync/internal_api/debug_info_event_listener.h
+++ b/sync/internal_api/debug_info_event_listener.h
@@ -47,7 +47,6 @@ class SYNC_EXPORT_PRIVATE DebugInfoEventListener
   virtual void OnConnectionStatusChange(
       ConnectionStatus connection_status) OVERRIDE;
   virtual void OnStopSyncingPermanently() OVERRIDE;
-  virtual void OnUpdatedToken(const std::string& token) OVERRIDE;
   virtual void OnActionableError(
       const SyncProtocolError& sync_error) OVERRIDE;
 
diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc
index 01ddda8..9f8848d 100644
--- a/sync/internal_api/js_sync_manager_observer.cc
+++ b/sync/internal_api/js_sync_manager_observer.cc
@@ -49,15 +49,6 @@ void JsSyncManagerObserver::OnConnectionStatusChange(ConnectionStatus status) {
                 "onConnectionStatusChange", JsEventDetails(&details));
 }
 
-void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
-  if (!event_handler_.IsInitialized()) {
-    return;
-  }
-  base::DictionaryValue details;
-  details.SetString("token", "<redacted>");
-  HandleJsEvent(FROM_HERE, "onUpdatedToken", JsEventDetails(&details));
-}
-
 void JsSyncManagerObserver::OnActionableError(
     const SyncProtocolError& sync_error) {
   if (!event_handler_.IsInitialized()) {
diff --git a/sync/internal_api/js_sync_manager_observer.h b/sync/internal_api/js_sync_manager_observer.h
index bda6d8c..17a40e7 100644
--- a/sync/internal_api/js_sync_manager_observer.h
+++ b/sync/internal_api/js_sync_manager_observer.h
@@ -35,7 +35,6 @@ class SYNC_EXPORT_PRIVATE JsSyncManagerObserver : public SyncManager::Observer {
   virtual void OnSyncCycleCompleted(
       const sessions::SyncSessionSnapshot& snapshot) OVERRIDE;
   virtual void OnConnectionStatusChange(ConnectionStatus status) OVERRIDE;
-  virtual void OnUpdatedToken(const std::string& token) OVERRIDE;
   virtual void OnInitializationComplete(
       const WeakHandle<JsBackend>& js_backend,
       const WeakHandle<DataTypeDebugInfoListener>& debug_info_listener,
diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc
index 65cb77e..e4b8c64 100644
--- a/sync/internal_api/js_sync_manager_observer_unittest.cc
+++ b/sync/internal_api/js_sync_manager_observer_unittest.cc
@@ -129,19 +129,5 @@ TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) {
   PumpLoop();
 }
 
-TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) {
-  base::DictionaryValue redacted_token_details;
-  redacted_token_details.SetString("token", "<redacted>");
-  base::DictionaryValue redacted_bootstrap_token_details;
-  redacted_bootstrap_token_details.SetString("bootstrapToken", "<redacted>");
-
-  EXPECT_CALL(mock_js_event_handler_,
-              HandleJsEvent("onUpdatedToken",
-                           HasDetailsAsDictionary(redacted_token_details)));
-
-  js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
-  PumpLoop();
-}
-
 }  // namespace
 }  // namespace syncer
diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h
index fe6f9ba..1cd3319 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/sync/internal_api/public/sync_manager.h
@@ -176,9 +176,6 @@ class SYNC_EXPORT SyncManager : public syncer::InvalidationHandler {
     // changed.
     virtual void OnConnectionStatusChange(ConnectionStatus status) = 0;
 
-    // Called when a new auth token is provided by the sync server.
-    virtual void OnUpdatedToken(const std::string& token) = 0;
-
     // Called when initialization is complete to the point that SyncManager can
     // process changes. This does not necessarily mean authentication succeeded
     // or that the SyncManager is online.
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 6ad9580..336e57b 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -949,12 +949,6 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
     return;
   }
 
-  if (event.what_happened == SyncEngineEvent::UPDATED_TOKEN) {
-    FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
-                      OnUpdatedToken(event.updated_token));
-    return;
-  }
-
   if (event.what_happened == SyncEngineEvent::ACTIONABLE_ERROR) {
     FOR_EACH_OBSERVER(
         SyncManager::Observer, observers_,
diff --git a/sync/internal_api/syncapi_server_connection_manager.cc b/sync/internal_api/syncapi_server_connection_manager.cc
index d18a8b2..35ca1e2 100644
--- a/sync/internal_api/syncapi_server_connection_manager.cc
+++ b/sync/internal_api/syncapi_server_connection_manager.cc
@@ -70,9 +70,6 @@ bool SyncAPIBridgedConnection::Init(const char* path,
   else
     response->server_status = HttpResponse::SYNC_SERVER_ERROR;
 
-  response->update_client_auth_header =
-      http->GetResponseHeaderValue("Update-Client-Auth");
-
   // Write the content into our buffer.
   buffer_.assign(http->GetResponseContent(), http->GetResponseContentLength());
   return true;