[GCM] Handling connection events in GCMAccountTracker

components/gcm_driver/gcm_account_mapper_unittest.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_account_mapper.h"
 
 #include "base/test/simple_test_clock.h"
 #include "base/time/time.h"
 #include "components/gcm_driver/fake_gcm_driver.h"
 #include "google_apis/gcm/engine/account_mapping.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 const char kGCMAccountMapperSenderId[] = "745476177629";
-const char kGCMAccountMapperAppId[] = "com.google.android.gms";
 const char kRegistrationId[] = "reg_id";
 
 AccountMapping MakeAccountMapping(const std::string& account_id,
                                   AccountMapping::MappingStatus status,
                                   const base::Time& status_change_timestamp,
                                   const std::string& last_message_id) {
   AccountMapping account_mapping;
   account_mapping.account_id = account_id;
   account_mapping.email = account_id + "@gmail.com";
   // account_mapping.access_token intentionally left empty.
@@ skipping 235 matching lines @@
 GCMAccountMapperTest::GCMAccountMapperTest() {
   Restart();
 }
 
 GCMAccountMapperTest::~GCMAccountMapperTest() {
 }
 
 void GCMAccountMapperTest::Restart() {
   if (account_mapper_)
     account_mapper_->ShutdownHandler();
+  gcm_driver_.RemoveAppHandler(kGCMAccountMapperAppId);
   account_mapper_.reset(new GCMAccountMapper(&gcm_driver_));
   scoped_ptr<base::SimpleTestClock> clock(new base::SimpleTestClock);
   clock_ = clock.get();
   account_mapper_->SetClockForTesting(clock.PassAs<base::Clock>());
 }
 
 // Tests the initialization of account mappings (from the store) when empty.
 // It also checks that initialization triggers registration ID request.
 TEST_F(GCMAccountMapperTest, InitializeAccountMappingsEmpty) {
   EXPECT_FALSE(gcm_driver().registration_id_requested());
@@ skipping 612 matching lines @@
   expected_mappings[1].status_change_timestamp = clock()->Now();
   expected_mappings[1].status = AccountMapping::MAPPED;
   expected_mappings[2].status_change_timestamp = clock()->Now();
   expected_mappings[2].status = AccountMapping::MAPPED;
 
   VerifyMappings(
       expected_mappings, GetAccounts(), "Step 6, Three mapped accounts");
 }
 
 }  // namespace gcm