Revert of Clear GCM data when the user clears cookies and other site data

chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 2013 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 "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 98 matching lines @@
 
   gcm_account_tracker_->Start();
 }
 
 void GCMProfileService::IdentityObserver::OnActiveAccountLogout() {
   account_id_.clear();
 
   // Check is necessary to not crash browser_tests.
   if (gcm_account_tracker_)
     gcm_account_tracker_->Stop();
-  // When sign-in enforcement is not dropped, OnSignedOut will also clear all
-  // the GCM data and a new GCM ID will be retrieved after the user signs in
-  // again. Otherwise, the user sign-out will not affect the existing GCM
-  // data.
-  driver_->OnSignedOut();
+  // TODO(fgorski): If we purge here, what should happen when we get
+  // OnActiveAccountLogin() right after that?
+  driver_->Purge();
 }
 
 std::string GCMProfileService::IdentityObserver::SignedInUserName() const {
   return driver_->IsStarted() ? account_id_ : std::string();
 }
 
 void GCMProfileService::IdentityObserver::AccountsUpdated(
     const std::map<std::string, std::string>& account_tokens) {
   driver_->SetAccountsForCheckin(account_tokens);
 }
@@ skipping 84 matching lines @@
   return identity_observer_ ? identity_observer_->SignedInUserName()
                             : std::string();
 #endif  // defined(OS_ANDROID)
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 }
 
 }  // namespace gcm