Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/invalidation/ticl_profile_settings_provider_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 "chrome/browser/invalidation/ticl_profile_settings_provider.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 38 matching lines @@
 }
 
 TiclProfileSettingsProviderTest::~TiclProfileSettingsProviderTest() {
 }
 
 void TiclProfileSettingsProviderTest::SetUp() {
   invalidation_service_.reset(new TiclInvalidationService(
       scoped_ptr<IdentityProvider>(new FakeIdentityProvider(&token_service_)),
       scoped_ptr<TiclSettingsProvider>(
           new TiclProfileSettingsProvider(&profile_)),
-      gcm::GCMProfileServiceFactory::GetForProfile(&profile_),
+      gcm::GCMProfileServiceFactory::GetForProfile(&profile_)->driver(),
       profile_.GetRequestContext()));
   invalidation_service_->Init(scoped_ptr<syncer::InvalidationStateTracker>(
       new syncer::FakeInvalidationStateTracker));
 }
 
 void TiclProfileSettingsProviderTest::TearDown() {
   invalidation_service_->Shutdown();
 }
 
 TiclInvalidationService::InvalidationNetworkChannel
@@ skipping 31 matching lines @@
   EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());
 
   // If invalidation channel setting is enabled first and the GCM setting is
   // enabled after that, switch to GCM channel.
   prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);
   prefs->SetBoolean(prefs::kGCMChannelEnabled, true);
   EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
 }
 
 }  // namespace invalidation