[CrOS Multidevice] Tweak GcmDeviceInfoProvider pointer to const.

This change is necessary because GcmDeviceInfoProviderImpl::GetInstance()
returns a const pointer.

Bug: 824568, 752273
Change-Id: I92b84b071e1cd3c782e6b5b0d1e7e25d539da1bf
Reviewed-on: https://chromium-review.googlesource.com/1079645Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563134}

chromeos/services/device_sync/device_sync_impl.cc

@@ -49,7 +49,7 @@ std::unique_ptr<DeviceSyncBase> DeviceSyncImpl::Factory::NewInstance(
     identity::IdentityManager* identity_manager,
     gcm::GCMDriver* gcm_driver,
     service_manager::Connector* connector,
-    cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+    const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
     scoped_refptr<net::URLRequestContextGetter> url_request_context) {
   if (test_factory_instance_) {
     return test_factory_instance_->BuildInstance(
@@ -74,7 +74,7 @@ std::unique_ptr<DeviceSyncBase> DeviceSyncImpl::Factory::BuildInstance(
     identity::IdentityManager* identity_manager,
     gcm::GCMDriver* gcm_driver,
     service_manager::Connector* connector,
-    cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+    const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
     scoped_refptr<net::URLRequestContextGetter> url_request_context) {
   return base::WrapUnique(new DeviceSyncImpl(
       identity_manager, gcm_driver, connector, gcm_device_info_provider,
@@ -103,7 +103,7 @@ DeviceSyncImpl::DeviceSyncImpl(
     identity::IdentityManager* identity_manager,
     gcm::GCMDriver* gcm_driver,
     service_manager::Connector* connector,
-    cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+    const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
     scoped_refptr<net::URLRequestContextGetter> url_request_context,
     base::Clock* clock,
     std::unique_ptr<PrefConnectionDelegate> pref_connection_delegate)

chromeos/services/device_sync/device_sync_impl.h

@@ -67,7 +67,7 @@ class DeviceSyncImpl : public DeviceSyncBase,
         identity::IdentityManager* identity_manager,
         gcm::GCMDriver* gcm_driver,
         service_manager::Connector* connector,
-        cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+        const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
         scoped_refptr<net::URLRequestContextGetter> url_request_context);
     static void SetInstanceForTesting(Factory* test_factory);
 
@@ -76,7 +76,7 @@ class DeviceSyncImpl : public DeviceSyncBase,
         identity::IdentityManager* identity_manager,
         gcm::GCMDriver* gcm_driver,
         service_manager::Connector* connector,
-        cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+        const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
         scoped_refptr<net::URLRequestContextGetter> url_request_context);
 
    private:
@@ -135,7 +135,7 @@ class DeviceSyncImpl : public DeviceSyncBase,
       identity::IdentityManager* identity_manager,
       gcm::GCMDriver* gcm_driver,
       service_manager::Connector* connector,
-      cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+      const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
       scoped_refptr<net::URLRequestContextGetter> url_request_context,
       base::Clock* clock,
       std::unique_ptr<PrefConnectionDelegate> pref_connection_delegate);
@@ -174,7 +174,7 @@ class DeviceSyncImpl : public DeviceSyncBase,
   identity::IdentityManager* identity_manager_;
   gcm::GCMDriver* gcm_driver_;
   service_manager::Connector* connector_;
-  cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider_;
+  const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_;
   base::Clock* clock_;
   std::unique_ptr<PrefConnectionDelegate> pref_connection_delegate_;

chromeos/services/device_sync/device_sync_service.cc

@@ -17,7 +17,7 @@ namespace device_sync {
 DeviceSyncService::DeviceSyncService(
     identity::IdentityManager* identity_manager,
     gcm::GCMDriver* gcm_driver,
-    cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+    const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
     scoped_refptr<net::URLRequestContextGetter> url_request_context)
     : identity_manager_(identity_manager),
       gcm_driver_(gcm_driver),

chromeos/services/device_sync/device_sync_service.h

@@ -42,7 +42,7 @@ class DeviceSyncService : public service_manager::Service {
   DeviceSyncService(
       identity::IdentityManager* identity_manager,
       gcm::GCMDriver* gcm_driver,
-      cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+      const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
       scoped_refptr<net::URLRequestContextGetter> url_request_context);
   ~DeviceSyncService() override;
 
@@ -56,7 +56,7 @@ class DeviceSyncService : public service_manager::Service {
  private:
   identity::IdentityManager* identity_manager_;
   gcm::GCMDriver* gcm_driver_;
-  cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider_;
+  const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_;
 
   std::unique_ptr<DeviceSyncBase> device_sync_;

chromeos/services/device_sync/device_sync_service_unittest.cc

@@ -420,7 +420,7 @@ class DeviceSyncServiceTest : public testing::Test {
         identity::IdentityManager* identity_manager,
         gcm::GCMDriver* gcm_driver,
         service_manager::Connector* connector,
-        cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+        const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
         scoped_refptr<net::URLRequestContextGetter> url_request_context)
         override {
       return base::WrapUnique(new DeviceSyncImpl(

chromeos/services/device_sync/public/cpp/device_sync_client_impl_unittest.cc

@@ -59,7 +59,7 @@ class FakeDeviceSyncImplFactory : public DeviceSyncImpl::Factory {
       identity::IdentityManager* identity_manager,
       gcm::GCMDriver* gcm_driver,
       service_manager::Connector* connector,
-      cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
+      const cryptauth::GcmDeviceInfoProvider* gcm_device_info_provider,
       scoped_refptr<net::URLRequestContextGetter> url_request_context)
       override {
     EXPECT_TRUE(fake_device_sync_);