Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/services/gcm/gcm_profile_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_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace gcm {
 
-// A specialization of GCMDriver that is tied to a Profile.
-class GCMProfileService : public GCMDriver, public KeyedService {
+class GCMClientFactory;
+class GCMDriver;
+
+// Providing GCM service, via GCMDriver, to a profile.
+class GCMProfileService : public KeyedService {
  public:
   // Any change made to this enum should have corresponding change in the
   // GetGCMEnabledStateString(...) function.
   enum GCMEnabledState {
     // GCM is always enabled. GCMClient will always load and connect with GCM.
     ALWAYS_ENABLED,
     // GCM is only enabled for apps. GCMClient will start to load and connect
     // with GCM only when GCM API is used.
     ENABLED_FOR_APPS,
     // GCM is always disabled. GCMClient will never load and connect with GCM.
     ALWAYS_DISABLED
   };
 
   // Returns the GCM enabled state.
   static GCMEnabledState GetGCMEnabledState(Profile* profile);
 
   // Returns text representation of a GCMEnabledState enum entry.
   static std::string GetGCMEnabledStateString(GCMEnabledState state);
 
   // Register profile-specific prefs for GCM.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   explicit GCMProfileService(Profile* profile);
   virtual ~GCMProfileService();
 
+  void Initialize(scoped_ptr<GCMClientFactory> gcm_client_factory);
+
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
-  // Returns the user name if the profile is signed in.
-  std::string SignedInUserName() const;
+  // For testing purpose.
+  void SetDriverForTesting(GCMDriver* driver);
 
- protected:
-  // Overridden from GCMDriver:
-  virtual bool ShouldStartAutomatically() const OVERRIDE;
-  virtual base::FilePath GetStorePath() const OVERRIDE;
-  virtual scoped_refptr<net::URLRequestContextGetter>
-      GetURLRequestContextGetter() const OVERRIDE;
+  GCMDriver* driver() const { return driver_.get(); }

[Nicolas Zea, 2014/05/19 21:04:06]

I'm a bit concerned about the possibility of other services calling and using
driver() before one has been created. Do you think it makes sense to always have
an unitialized driver object we could always return, and have Initialize invoke
GCMDriver::Initialize?

Alternatively, it looks like we always immediately call Initialize after
constructing the GCMProfileService object. How about we just pass the
GCMClientFactory in the constructor, and get rid of initialize altogether
(creating everything in the constructor)? This way, driver_ will always exist.

[jianli, 2014/05/19 23:03:48]

Moved Initialize logic into constructor.

 
  private:
   // The profile which owns this object.
   Profile* profile_;
 
+  scoped_ptr<GCMDriver> driver_;
+
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_