Removal of Profile from content part 6.

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2011 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/sync_setup_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 283 matching lines @@
       NewCallback(this, &SyncSetupHandler::HandleShowErrorUI));
   web_ui_->RegisterMessageCallback("SyncSetupShowSetupUI",
       NewCallback(this, &SyncSetupHandler::HandleShowSetupUI));
 }
 
 // Ideal(?) solution here would be to mimic the ClientLogin overlay.  Since
 // this UI must render an external URL, that overlay cannot be used directly.
 // The current implementation is functional, but fails asthetically.
 // TODO(rickcam): Bug 90711: Update UI for OAuth sign-in flow
 void SyncSetupHandler::ShowOAuthLogin() {
-  web_ui_->GetProfile()->GetProfileSyncService()->signin()->StartOAuthSignIn();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  profile->GetProfileSyncService()->signin()->StartOAuthSignIn();
 }
 
 void SyncSetupHandler::ShowGaiaLogin(const DictionaryValue& args) {
   StringValue page("login");
   web_ui_->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 }
 
 void SyncSetupHandler::ShowGaiaSuccessAndClose() {
   web_ui_->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndClose");
@@ skipping 110 matching lines @@
   flow_->OnPassphraseCancel();
 }
 
 void SyncSetupHandler::HandleAttachHandler(const ListValue* args) {
   OpenSyncSetup();
 }
 
 void SyncSetupHandler::HandleShowErrorUI(const ListValue* args) {
   DCHECK(!flow_);
 
-  ProfileSyncService* service =
-    web_ui_->GetProfile()->GetProfileSyncService();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  ProfileSyncService* service = profile->GetProfileSyncService();
   DCHECK(service);
 
   service->get_wizard().Step(SyncSetupWizard::NONFATAL_ERROR);
 
   // Show the Sync Setup page.
   if (service->get_wizard().IsVisible()) {
     service->get_wizard().Focus();
   } else {
     StringValue page("syncSetup");
     web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", page);
   }
 }
 
 void SyncSetupHandler::HandleShowSetupUI(const ListValue* args) {
   DCHECK(!flow_);
   ShowSetupUI();
 }
 
 void SyncSetupHandler::CloseSyncSetup() {
   if (flow_) {
     flow_->OnDialogClosed(std::string());
     flow_ = NULL;
   }
 }
 
 void SyncSetupHandler::OpenSyncSetup() {
   DCHECK(web_ui_);
   DCHECK(!flow_);
 
-  ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService();
+  Profile* profile = Profile::FromWebUI(web_ui_);
+  ProfileSyncService* service = profile->GetProfileSyncService();
   if (!service) {
     // If there's no sync service, the user tried to manually invoke a syncSetup
     // URL, but sync features are disabled.  We need to close the overlay for
     // this (rare) case.
     web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
     return;
   }
 
   // If the wizard is not visible, step into the appropriate UI state.
   if (!service->get_wizard().IsVisible())
     ShowSetupUI();
 
   // The SyncSetupFlow will set itself as the |flow_|.
   if (!service->get_wizard().AttachSyncSetupHandler(this)) {
     // If attach fails, a wizard is already activated and attached to a flow
     // handler.
     web_ui_->CallJavascriptFunction("OptionsPage.closeOverlay");
     service->get_wizard().Focus();
   }
 }