Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/invalidation/ticl_invalidation_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 "chrome/browser/invalidation/ticl_invalidation_service.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
@@ skipping 19 matching lines @@
 
   // TiclSettingsProvider:
   virtual bool UseGCMChannel() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeTiclSettingsProvider);
 };
 
 class FakeGCMDriver : public gcm::GCMDriver {
  public:
-  explicit FakeGCMDriver(OAuth2TokenService* token_service);
+  FakeGCMDriver();
   virtual ~FakeGCMDriver();
 
- protected:
-  // gcm::GCMDriver:
-  virtual bool ShouldStartAutomatically() const OVERRIDE;
-  virtual base::FilePath GetStorePath() const OVERRIDE;
-  virtual scoped_refptr<net::URLRequestContextGetter>
-      GetURLRequestContextGetter() const OVERRIDE;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeGCMDriver);
 };
 
 FakeTiclSettingsProvider::FakeTiclSettingsProvider() {
 }
 
 FakeTiclSettingsProvider::~FakeTiclSettingsProvider() {
 }
 
 bool FakeTiclSettingsProvider::UseGCMChannel() const {
   return false;
 }
 
-FakeGCMDriver::FakeGCMDriver(OAuth2TokenService* token_service)
-    : GCMDriver(scoped_ptr<IdentityProvider>(
-          new FakeIdentityProvider(token_service))) {
+FakeGCMDriver::FakeGCMDriver() {
 }
 
 FakeGCMDriver::~FakeGCMDriver() {
 }
 
-bool FakeGCMDriver::ShouldStartAutomatically() const {
-  return false;
-}
-
-base::FilePath FakeGCMDriver::GetStorePath() const {
-  return base::FilePath();
-}
-
-scoped_refptr<net::URLRequestContextGetter>
-FakeGCMDriver::GetURLRequestContextGetter() const {
-  return NULL;
-}
-
 }  // namespace
 
 class TiclInvalidationServiceTestDelegate {
  public:
   TiclInvalidationServiceTestDelegate() {}
 
   ~TiclInvalidationServiceTestDelegate() {
     DestroyInvalidationService();
   }
 
   void CreateInvalidationService() {
     CreateUninitializedInvalidationService();
     InitializeInvalidationService();
   }
 
   void CreateUninitializedInvalidationService() {
-    gcm_service_.reset(new FakeGCMDriver(&token_service_));
+    gcm_service_.reset(new FakeGCMDriver());
     invalidation_service_.reset(new TiclInvalidationService(
         scoped_ptr<IdentityProvider>(new FakeIdentityProvider(&token_service_)),
         scoped_ptr<TiclSettingsProvider>(new FakeTiclSettingsProvider),
         gcm_service_.get(),
         NULL));
   }
 
   void InitializeInvalidationService() {
     fake_invalidator_ = new syncer::FakeInvalidator();
     invalidation_service_->InitForTest(
@@ skipping 13 matching lines @@
   void TriggerOnInvalidatorStateChange(syncer::InvalidatorState state) {
     fake_invalidator_->EmitOnInvalidatorStateChange(state);
   }
 
   void TriggerOnIncomingInvalidation(
       const syncer::ObjectIdInvalidationMap& invalidation_map) {
     fake_invalidator_->EmitOnIncomingInvalidation(invalidation_map);
   }
 
   FakeOAuth2TokenService token_service_;
   scoped_ptr<gcm::GCMDriver> gcm_service_;

[fgorski, 2014/05/19 17:33:32]

gcm_driver_

[jianli, 2014/05/19 18:37:20]

Done.

   syncer::FakeInvalidator* fake_invalidator_;  // Owned by the service.
 
   scoped_ptr<TiclInvalidationService> invalidation_service_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     TiclInvalidationServiceTest, InvalidationServiceTest,
     TiclInvalidationServiceTestDelegate);
 
 namespace internal {
@@ skipping 31 matching lines @@
 
   delegate->InitializeInvalidationService();
 
   invalidator->RequestDetailedStatus(
       base::Bind(&internal::FakeCallbackContainer::FakeCallback,
                  fake_container.weak_ptr_factory_.GetWeakPtr()));
   EXPECT_TRUE(fake_container.called_);
 }
 
 }  // namespace invalidation