Make GCMDriver::GetInstanceIDHandler protected, to avoid misuse

components/gcm_driver/gcm_driver_desktop.h

Index: components/gcm_driver/gcm_driver_desktop.h
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h
index 51f002e8913b595d3794de4414b3fd6aaab8e7a6..f42bd0525fcfc216d2d51b05fb704b860af066e2 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -61,7 +61,7 @@ class GCMDriverDesktop : public GCMDriver,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
   ~GCMDriverDesktop() override;
 
-  // GCMDriver overrides:
+  // GCMDriver implementation:
   void Shutdown() override;
   void OnSignedIn() override;
   void OnSignedOut() override;
@@ -86,27 +86,10 @@ class GCMDriverDesktop : public GCMDriver,
   base::Time GetLastTokenFetchTime() override;
   void SetLastTokenFetchTime(const base::Time& time) override;
   void WakeFromSuspendForHeartbeat(bool wake) override;
-  InstanceIDHandler* GetInstanceIDHandler() override;
+  InstanceIDHandler* GetInstanceIDHandlerInternal() override;
   void AddHeartbeatInterval(const std::string& scope, int interval_ms) override;
   void RemoveHeartbeatInterval(const std::string& scope) override;
 
-  // InstanceIDHandler overrides:
-  void GetToken(const std::string& app_id,
-                const std::string& authorized_entity,
-                const std::string& scope,
-                const std::map<std::string, std::string>& options,
-                const GetTokenCallback& callback) override;
-  void DeleteToken(const std::string& app_id,
-                   const std::string& authorized_entity,
-                   const std::string& scope,
-                   const DeleteTokenCallback& callback) override;
-  void AddInstanceIDData(const std::string& app_id,
-                         const std::string& instance_id,
-                         const std::string& extra_data) override;
-  void RemoveInstanceIDData(const std::string& app_id) override;
-  void GetInstanceIDData(const std::string& app_id,
-                         const GetInstanceIDDataCallback& callback) override;
-
   // Exposed for testing purpose.
   bool gcm_enabled() const { return gcm_enabled_; }
   GCMChannelStatusSyncer* gcm_channel_status_syncer_for_testing() {
@@ -126,6 +109,23 @@ class GCMDriverDesktop : public GCMDriver,
                                GCMEncryptionProvider::DecryptionResult result)
       override;
 
+  // InstanceIDHandler implementation:
+  void GetToken(const std::string& app_id,
+                const std::string& authorized_entity,
+                const std::string& scope,
+                const std::map<std::string, std::string>& options,
+                const GetTokenCallback& callback) override;
+  void DeleteToken(const std::string& app_id,
+                   const std::string& authorized_entity,
+                   const std::string& scope,
+                   const DeleteTokenCallback& callback) override;
+  void AddInstanceIDData(const std::string& app_id,
+                         const std::string& instance_id,
+                         const std::string& extra_data) override;
+  void RemoveInstanceIDData(const std::string& app_id) override;
+  void GetInstanceIDData(const std::string& app_id,
+                         const GetInstanceIDDataCallback& callback) override;
+
  private:
   class IOWorker;