Make GCMProfileService own GCMDriver, instead of deriving from it

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"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gcm/gcm_client.h"
 #include "grit/browser_resources.h"
 
@@ skipping 127 matching lines @@
   base::DictionaryValue results;
   base::DictionaryValue* device_info = new base::DictionaryValue();
   results.Set("deviceInfo", device_info);
 
   device_info->SetBoolean("profileServiceCreated", profile_service != NULL);
   device_info->SetString("gcmEnabledState",
       gcm::GCMProfileService::GetGCMEnabledStateString(
           gcm::GCMProfileService::GetGCMEnabledState(profile)));
   if (profile_service) {
     device_info->SetString("signedInUserName",
-                           profile_service->SignedInUserName());
+                           profile_service->driver()->SignedInUserName());
     device_info->SetBoolean("gcmClientReady",
-                            profile_service->IsGCMClientReady());
+                            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",
                            JoinString(stats->registered_app_ids, ","));
     if (stats->connection_client_created)
@@ skipping 50 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->SignedInUserName().empty()) {
+  } else if (profile_service->driver()->SignedInUserName().empty()) {
     ReturnResults(profile, profile_service, NULL);
   } else {
-    profile_service->GetGCMStatistics(
+    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->SignedInUserName().empty()) {
+  if (profile_service->driver()->SignedInUserName().empty()) {
     ReturnResults(profile, profile_service, NULL);
     return;
   }
   // Get fresh stats after changing recording setting.
-  profile_service->SetGCMRecording(
+  profile_service->driver()->SetGCMRecording(
       base::Bind(
           &GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished,
           weak_ptr_factory_.GetWeakPtr()),
       recording);
 }
 
 void GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished(
     const gcm::GCMClient::GCMStatistics& stats) const {
   Profile* profile = Profile::FromWebUI(web_ui());
   DCHECK(profile);
@@ skipping 30 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() {}