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;
+  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();

[fgorski, 2014/09/12 20:15:53]

this causes a wipe of Device ID, right?

Please look into.

[jianli, 2014/09/12 22:13:10]

Removed the confusing comment here. Also updated OnSignedOut.

 
   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());
   GCMDriver::AddAppHandler(app_id, handler);
@@ skipping 340 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