Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/invalidation/gcm_invalidation_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
 #define CHROME_BROWSER_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 19 matching lines @@
 // needed for GCMNetworkChannel. GCMInvalidationBridge lives on UI thread while
 // Core lives on IO thread. Core implements GCMNetworkChannelDelegate and posts
 // all function calls to GCMInvalidationBridge which does actual work to perform
 // them.
 class GCMInvalidationBridge : public gcm::GCMAppHandler,
                               public OAuth2TokenService::Consumer,
                               public base::NonThreadSafe {
  public:
   class Core;
 
-  GCMInvalidationBridge(gcm::GCMDriver* gcm_service,
+  GCMInvalidationBridge(gcm::GCMDriver* gcm_driver,
                         IdentityProvider* identity_provider);
   virtual ~GCMInvalidationBridge();
 
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
@@ skipping 42 matching lines @@
   bool subscribed_for_incoming_messages_;
 
   base::WeakPtrFactory<GCMInvalidationBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMInvalidationBridge);
 };
 
 }  // namespace invalidation
 
 #endif  // CHROME_BROWSER_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_