Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/invalidation/ticl_invalidation_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
 #define CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 44 matching lines @@
     GCM_NETWORK_CHANNEL = 1,
 
     // This enum is used in UMA_HISTOGRAM_ENUMERATION. Insert new values above
     // this line.
     NETWORK_CHANNELS_COUNT = 2
   };
 
   TiclInvalidationService(
       scoped_ptr<IdentityProvider> identity_provider,
       scoped_ptr<TiclSettingsProvider> settings_provider,
-      gcm::GCMDriver* gcm_service,
+      gcm::GCMDriver* gcm_driver,
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
   virtual ~TiclInvalidationService();
 
   void Init(
       scoped_ptr<syncer::InvalidationStateTracker> invalidation_state_tracker);
 
   // InvalidationService implementation.
   // It is an error to have registered handlers when Shutdown() is called.
   virtual void RegisterInvalidationHandler(
       syncer::InvalidationHandler* handler) OVERRIDE;
@@ skipping 87 matching lines @@
   // Keep a copy of the important parameters used in network channel creation
   // for debugging.
   base::DictionaryValue network_channel_options_;
 
   DISALLOW_COPY_AND_ASSIGN(TiclInvalidationService);
 };
 
 }  // namespace invalidation
 
 #endif  // CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_