Keep the GCM data intact when the user signs out of the profile

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 368 matching lines @@
   gcm_channel_status_syncer_.reset();
 
   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 not dropped, we will stop the GCM connection
+  // when the user signs out.
+  if (!GCMDriver::IsAllowedForAllUsers())
+    Stop();

[fgorski, 2014/10/03 01:32:50]

I think this leaves that app handlers still hanging. This also causes
initialization to happen multiple times on the account mapper.

Did you consider shutting down the app handlers?
If we don't want to do it, we should probably explicitly stop account mapper.

I am trying to work out a patch with a solution to that problem, but I need to
hear from you.

[jianli, 2014/10/06 07:07:02]

I don't think we want to shut down the app handlers because once the user signs
in everything should start to work.

It's better to stop account mapper, probbaly in GCMDriverDesktop::Stop.

+}
+
 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 351 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