[GCM] Remove all persisted data and close connections when signing out of a profile

chrome/browser/services/gcm/gcm_profile_service_unittest.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 <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 747 matching lines @@
   // help catch this.
   consumer()->set_gcm_client_error_simulation(GCMClientMock::FORCE_ERROR);
 
   // Simulate start-up by recreating GCMProfileService.
   consumer()->CreateGCMProfileServiceInstance();
 
   // Simulate start-up by reloading extension.
   consumer()->ReloadExtension(extension);
 
   // This should read the registration info from the extension's state store.
-  // We still need to wait since the reading from state store might happen at
-  // the same time.
   consumer()->Register(extension->id(), sender_ids);
-  WaitUntilCompleted();
+  PumpUILoop();
   EXPECT_EQ(old_registration_id, consumer()->registration_id());
   EXPECT_EQ(GCMClient::SUCCESS, consumer()->registration_result());
 }
 
 TEST_F(GCMProfileServiceSingleProfileTest,
        GCMClientReadyAfterReadingRegistration) {
   scoped_refptr<Extension> extension(consumer()->CreateExtension());
 
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender1");
@@ skipping 24 matching lines @@
   EXPECT_TRUE(consumer()->registration_id().empty());
   EXPECT_EQ(GCMClient::UNKNOWN_ERROR, consumer()->registration_result());
 
   // Register operation will be invoked after GCMClient becomes ready.
   consumer()->GetGCMClient()->SetReady();
   WaitUntilCompleted();
   EXPECT_EQ(old_registration_id, consumer()->registration_id());
   EXPECT_EQ(GCMClient::SUCCESS, consumer()->registration_result());
 }
 
+TEST_F(GCMProfileServiceSingleProfileTest,
+       PersistedRegistrationInfoRemoveAfterSignOut) {
+  std::vector<std::string> sender_ids;
+  sender_ids.push_back("sender1");
+  consumer()->Register(kTestingAppId, sender_ids);
+  WaitUntilCompleted();
+
+  // The app id and registration info should be persisted.
+  EXPECT_TRUE(profile()->GetPrefs()->HasPrefPath(prefs::kGCMRegisteredAppIDs));
+  EXPECT_TRUE(consumer()->HasPersistedRegistrationInfo(kTestingAppId));
+
+  consumer()->SignOut();
+  PumpUILoop();
+
+  // The app id and persisted registration info should be removed.
+  EXPECT_FALSE(profile()->GetPrefs()->HasPrefPath(prefs::kGCMRegisteredAppIDs));
+  EXPECT_FALSE(consumer()->HasPersistedRegistrationInfo(kTestingAppId));
+}
+
 TEST_F(GCMProfileServiceSingleProfileTest, RegisterAfterSignOut) {
   // This will trigger check-out.
   consumer()->SignOut();
 
   std::vector<std::string> sender_ids;
   sender_ids.push_back("sender1");
   consumer()->Register(kTestingAppId, sender_ids);
 
   EXPECT_TRUE(consumer()->registration_id().empty());
   EXPECT_EQ(GCMClient::NOT_SIGNED_IN, consumer()->registration_result());
@@ skipping 419 matching lines @@
   consumer()->gcm_event_router()->clear_results();
   WaitUntilCompleted();
 
   EXPECT_EQ(FakeGCMEventRouter::MESSAGE_EVENT,
             consumer()->gcm_event_router()->received_event());
   EXPECT_TRUE(
       in_message5.data == consumer()->gcm_event_router()->message().data);
 }
 
 }  // namespace gcm