Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

chrome/browser/ui/webui/gcm_internals_ui.cc

 // Copyright 2014 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 "chrome/browser/ui/webui/gcm_internals_ui.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 138 matching lines @@
     const gcm::GCMClient::GCMStatistics* stats) const {
   base::DictionaryValue results;
   base::DictionaryValue* device_info = new base::DictionaryValue();
   results.Set("deviceInfo", device_info);
 
   device_info->SetBoolean("profileServiceCreated", profile_service != NULL);
   device_info->SetBoolean("gcmEnabled",
                           gcm::GCMProfileService::IsGCMEnabled(profile));
   if (profile_service) {
     device_info->SetString("signedInUserName",
-                           profile_service->driver()->SignedInUserName());
+                           profile_service->SignedInUserName());
     device_info->SetBoolean("gcmClientReady",
                             profile_service->driver()->IsGCMClientReady());
   }
   if (stats) {
     results.SetBoolean("isRecording", stats->is_recording);
     device_info->SetBoolean("gcmClientCreated", stats->gcm_client_created);
     device_info->SetString("gcmClientState", stats->gcm_client_state);
     device_info->SetBoolean("connectionClientCreated",
                             stats->connection_client_created);
     device_info->SetString("registeredAppIds",
@@ skipping 52 matching lines @@
     NOTREACHED();
     return;
   }
 
   Profile* profile = Profile::FromWebUI(web_ui());
   gcm::GCMProfileService* profile_service =
     gcm::GCMProfileServiceFactory::GetForProfile(profile);
 
   if (!profile_service) {
     ReturnResults(profile, NULL, NULL);
-  } else if (profile_service->driver()->SignedInUserName().empty()) {
+  } else if (profile_service->SignedInUserName().empty()) {
     ReturnResults(profile, profile_service, NULL);
   } else {
     profile_service->driver()->GetGCMStatistics(
         base::Bind(&GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished,
                    weak_ptr_factory_.GetWeakPtr()),
         clear_logs);
   }
 }
 
 void GcmInternalsUIMessageHandler::SetRecording(const base::ListValue* args) {
   if (args->GetSize() != 1) {
     NOTREACHED();
     return;
   }
   bool recording = false;
   if (!args->GetBoolean(0, &recording)) {
     NOTREACHED();
     return;
   }
 
   Profile* profile = Profile::FromWebUI(web_ui());
   gcm::GCMProfileService* profile_service =
       gcm::GCMProfileServiceFactory::GetForProfile(profile);
 
   if (!profile_service) {
     ReturnResults(profile, NULL, NULL);
     return;
   }
-  if (profile_service->driver()->SignedInUserName().empty()) {
+  if (profile_service->SignedInUserName().empty()) {
     ReturnResults(profile, profile_service, NULL);
     return;
   }
   // Get fresh stats after changing recording setting.
   profile_service->driver()->SetGCMRecording(
       base::Bind(
           &GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished,
           weak_ptr_factory_.GetWeakPtr()),
       recording);
 }
@@ skipping 35 matching lines @@
   html_source->AddResourcePath("gcm_internals.js", IDR_GCM_INTERNALS_JS);
   html_source->SetDefaultResource(IDR_GCM_INTERNALS_HTML);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, html_source);
 
   web_ui->AddMessageHandler(new GcmInternalsUIMessageHandler());
 }
 
 GCMInternalsUI::~GCMInternalsUI() {}