Make GCMDriver::GetInstanceIDHandler protected, to avoid misuse

components/gcm_driver/instance_id/instance_id_impl.h

Index: components/gcm_driver/instance_id/instance_id_impl.h
diff --git a/components/gcm_driver/instance_id/instance_id_impl.h b/components/gcm_driver/instance_id/instance_id_impl.h
index 1f8749eb9056712daf876f4b6f9cf01f19f5b32d..14feb4a6a7dc65bf3a9a215f9d47070075bb0a88 100644
--- a/components/gcm_driver/instance_id/instance_id_impl.h
+++ b/components/gcm_driver/instance_id/instance_id_impl.h
@@ -17,17 +17,12 @@
 #include "components/gcm_driver/gcm_delayed_task_controller.h"
 #include "components/gcm_driver/instance_id/instance_id.h"
 
-namespace gcm {
-class GCMDriver;
-class InstanceIDHandler;

[Peter Beverloo, 2016/03/11 16:10:19]

We should continue forward-declaring InstanceIDHandler (it's used in the
constructor).

[johnme, 2016/03/11 17:53:23]

Done.

-}  // namespace gcm
-
 namespace instance_id {
 
 // InstanceID implementation for desktop and iOS.
 class InstanceIDImpl : public InstanceID {
  public:
-  InstanceIDImpl(const std::string& app_id, gcm::GCMDriver* gcm_driver);
+  InstanceIDImpl(const std::string& app_id, gcm::InstanceIDHandler* handler);
   ~InstanceIDImpl() override;
 
   // InstanceID:
@@ -43,8 +38,6 @@ class InstanceIDImpl : public InstanceID {
   void DeleteID(const DeleteIDCallback& callback) override;
 
  private:
-  gcm::InstanceIDHandler* GetInstanceIDHandler() const;
-
   void EnsureIDGenerated();
 
   void OnGetTokenCompleted(const GetTokenCallback& callback,
@@ -69,8 +62,6 @@ class InstanceIDImpl : public InstanceID {
                      const DeleteTokenCallback& callback);
   void DoDeleteID(const DeleteIDCallback& callback);
 
-  gcm::GCMDriver* gcm_driver_;  // Not owned.
-
   gcm::GCMDelayedTaskController delayed_task_controller_;
 
   // The generated Instance ID.