Make GCMDriver::GetInstanceIDHandler protected, to avoid misuse

components/gcm_driver/instance_id/instance_id_impl.cc

 // Copyright 2015 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 "components/gcm_driver/instance_id/instance_id_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
-#include "components/gcm_driver/gcm_driver_desktop.h"
+#include "components/gcm_driver/gcm_driver.h"
 #include "crypto/random.h"
 
 namespace instance_id {
 
 namespace {
 
 InstanceID::Result GCMClientResultToInstanceIDResult(
     gcm::GCMClient::Result result) {
   switch (result) {
     case gcm::GCMClient::SUCCESS:
@@ skipping 14 matching lines @@
       NOTREACHED() << "Unexpected value of result cannot be converted: "
                    << result;
   }
   return InstanceID::UNKNOWN_ERROR;
 }
 
 }  // namespace
 
 // static
 scoped_ptr<InstanceID> InstanceID::Create(const std::string& app_id,
-                                          gcm::GCMDriver* gcm_driver) {
-  return make_scoped_ptr(new InstanceIDImpl(app_id, gcm_driver));
+                                          gcm::InstanceIDHandler* handler) {
+  return make_scoped_ptr(new InstanceIDImpl(app_id, handler));
 }
 
 InstanceIDImpl::InstanceIDImpl(const std::string& app_id,
-                               gcm::GCMDriver* gcm_driver)
-    : InstanceID(app_id),
-      gcm_driver_(gcm_driver),
-      weak_ptr_factory_(this) {
-  GetInstanceIDHandler()->GetInstanceIDData(
-      app_id,
-      base::Bind(&InstanceIDImpl::GetInstanceIDDataCompleted,
-                 weak_ptr_factory_.GetWeakPtr()));
+                               gcm::InstanceIDHandler* handler)
+    : InstanceID(app_id, handler), weak_ptr_factory_(this) {
+  handler->GetInstanceIDData(
+      app_id, base::Bind(&InstanceIDImpl::GetInstanceIDDataCompleted,
+                         weak_ptr_factory_.GetWeakPtr()));
 }
 
 InstanceIDImpl::~InstanceIDImpl() {
 }
 
 void InstanceIDImpl::GetID(const GetIDCallback& callback) {
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
     delayed_task_controller_.AddTask(
         base::Bind(&InstanceIDImpl::DoGetID,
                    weak_ptr_factory_.GetWeakPtr(),
@@ skipping 48 matching lines @@
   DoGetToken(authorized_entity, scope, options, callback);
 }
 
 void InstanceIDImpl::DoGetToken(
     const std::string& authorized_entity,
     const std::string& scope,
     const std::map<std::string, std::string>& options,
     const GetTokenCallback& callback) {
   EnsureIDGenerated();
 
-  GetInstanceIDHandler()->GetToken(
-      app_id(),
-      authorized_entity,
-      scope,
-      options,
-      base::Bind(&InstanceIDImpl::OnGetTokenCompleted,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
+  handler()->GetToken(app_id(), authorized_entity, scope, options,
+                      base::Bind(&InstanceIDImpl::OnGetTokenCompleted,
+                                 weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void InstanceIDImpl::DeleteToken(const std::string& authorized_entity,
                                  const std::string& scope,
                                  const DeleteTokenCallback& callback) {
   DCHECK(!authorized_entity.empty());
   DCHECK(!scope.empty());
 
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
     delayed_task_controller_.AddTask(
@@ skipping 11 matching lines @@
 void InstanceIDImpl::DoDeleteToken(
     const std::string& authorized_entity,
     const std::string& scope,
     const DeleteTokenCallback& callback) {
   // Nothing to delete if the ID has not been generated.
   if (id_.empty()) {
     callback.Run(InstanceID::INVALID_PARAMETER);
     return;
   }
 
-  GetInstanceIDHandler()->DeleteToken(
-      app_id(),
-      authorized_entity,
-      scope,
-      base::Bind(&InstanceIDImpl::OnDeleteTokenCompleted,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
+  handler()->DeleteToken(app_id(), authorized_entity, scope,
+                         base::Bind(&InstanceIDImpl::OnDeleteTokenCompleted,
+                                    weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void InstanceIDImpl::DeleteID(const DeleteIDCallback& callback) {
   if (!delayed_task_controller_.CanRunTaskWithoutDelay()) {
     delayed_task_controller_.AddTask(
         base::Bind(&InstanceIDImpl::DoDeleteID,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
     return;
   }
 
   DoDeleteID(callback);
 }
 
 void InstanceIDImpl::DoDeleteID(const DeleteIDCallback& callback) {
   // Nothing to do if ID has not been generated.
   if (id_.empty()) {
     callback.Run(InstanceID::SUCCESS);
     return;
   }
 
-  GetInstanceIDHandler()->DeleteAllTokensForApp(
-      app_id(),
-      base::Bind(&InstanceIDImpl::OnDeleteIDCompleted,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 callback));
+  handler()->DeleteAllTokensForApp(
+      app_id(), base::Bind(&InstanceIDImpl::OnDeleteIDCompleted,
+                           weak_ptr_factory_.GetWeakPtr(), callback));
 
-  GetInstanceIDHandler()->RemoveInstanceIDData(app_id());
+  handler()->RemoveInstanceIDData(app_id());
 
   id_.clear();
   creation_time_ = base::Time();
 }
 
 void InstanceIDImpl::OnGetTokenCompleted(const GetTokenCallback& callback,
                                          const std::string& token,
                                          gcm::GCMClient::Result result) {
   callback.Run(token, GCMClientResultToInstanceIDResult(result));
 }
@@ skipping 22 matching lines @@
     if (!base::StringToInt64(extra_data, &time_internal)) {
       DVLOG(1) << "Failed to parse the time data: " + extra_data;
       return;
     }
     creation_time_ = base::Time::FromInternalValue(time_internal);
   }
 
   delayed_task_controller_.SetReady();
 }
 
-gcm::InstanceIDHandler* InstanceIDImpl::GetInstanceIDHandler() const {
-  gcm::InstanceIDHandler* handler = gcm_driver_->GetInstanceIDHandler();
-  DCHECK(handler);
-  return handler;
-}
-
 void InstanceIDImpl::EnsureIDGenerated() {
   if (!id_.empty())
     return;
 
   // Now produce the ID in the following steps:
 
   // 1) Generates the random number in 8 bytes which is required by the server.
   //    We don't want to be strictly cryptographically secure. The server might
   //    reject the ID if there is a conflict or problem.
   uint8_t bytes[kInstanceIDByteLength];
@@ skipping 10 matching lines @@
   base::Base64Encode(
       base::StringPiece(reinterpret_cast<const char*>(bytes), sizeof(bytes)),
       &id_);
   std::replace(id_.begin(), id_.end(), '+', '-');
   std::replace(id_.begin(), id_.end(), '/', '_');
   id_.erase(std::remove(id_.begin(), id_.end(), '='), id_.end());
 
   creation_time_ = base::Time::Now();
 
   // Save to the persistent store.
-  GetInstanceIDHandler()->AddInstanceIDData(
-      app_id(),
-      id_,
-      base::Int64ToString(creation_time_.ToInternalValue()));
+  handler()->AddInstanceIDData(
+      app_id(), id_, base::Int64ToString(creation_time_.ToInternalValue()));
 }
 
 }  // namespace instance_id