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

components/gcm_driver/gcm_driver_desktop.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 "components/gcm_driver/gcm_driver_desktop.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 351 matching lines @@
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
   GCMDriver::Shutdown();
   io_thread_->DeleteSoon(FROM_HERE, io_worker_.release());
 }
 
 void GCMDriverDesktop::OnSignedIn() {
   signed_in_ = true;
   EnsureStarted();
 }
 
-void GCMDriverDesktop::OnSignedOut() {
-  signed_in_ = false;
-
-  // When sign-in enforcement is dropped, we will no longer wipe out the GCM
-  // data when the user signs out.
-  if (!GCMDriver::IsAllowedForAllUsers())
-    Purge();
-}
-
 void GCMDriverDesktop::Purge() {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
 
+  // We still proceed with the check-out logic even if the check-in is not
+  // initiated in the current session. This will make sure that all the
+  // persisted data written previously will get purged.
+  signed_in_ = false;
   RemoveCachedData();
 
   io_thread_->PostTask(FROM_HERE,
                        base::Bind(&GCMDriverDesktop::IOWorker::CheckOut,
                        base::Unretained(io_worker_.get())));
 }
 
 void GCMDriverDesktop::AddAppHandler(const std::string& app_id,
                                      GCMAppHandler* handler) {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
@@ skipping 220 matching lines @@
   if (gcm_started_)
     return GCMClient::SUCCESS;
 
   if (!gcm_enabled_)
     return GCMClient::GCM_DISABLED;
 
   // Have any app requested the service?
   if (app_handlers().empty())
     return GCMClient::UNKNOWN_ERROR;
 
+  // TODO(jianli): To be removed when sign-in enforcement is dropped.
   if (!signed_in_ && !GCMDriver::IsAllowedForAllUsers())
     return GCMClient::NOT_SIGNED_IN;
 
   DCHECK(!delayed_task_controller_);
   delayed_task_controller_.reset(new GCMDelayedTaskController);
 
   // Note that we need to pass weak pointer again since the existing weak
   // pointer in IOWorker might have been invalidated when check-out occurs.
   io_thread_->PostTask(
       FROM_HERE,
@@ skipping 100 matching lines @@
 
   // Normally request_gcm_statistics_callback_ would not be null.
   if (!request_gcm_statistics_callback_.is_null())
     request_gcm_statistics_callback_.Run(stats);
   else
     LOG(WARNING) << "request_gcm_statistics_callback_ is NULL.";
 }
 
 }  // namespace gcm