Removal of Profile from content part 6.

chrome/browser/ui/webui/options/handler_options_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/options/handler_options_handler.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 HandlerOptionsHandler::HandlerOptionsHandler() {
 }
 
 HandlerOptionsHandler::~HandlerOptionsHandler() {
 }
 
@@ skipping 12 matching lines @@
       { "handlers_active_heading", IDS_HANDLERS_ACTIVE_HEADING },
       { "handlers_ignored_heading", IDS_HANDLERS_IGNORED_HEADING },
   };
   RegisterTitle(localized_strings, "handlersPage",
                 IDS_HANDLER_OPTIONS_WINDOW_TITLE);
   RegisterStrings(localized_strings, resources, arraysize(resources));
 }
 
 void HandlerOptionsHandler::Initialize() {
   UpdateHandlerList();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED,
-      Source<Profile>(web_ui_->GetProfile()));
+      Source<Profile>(profile));
 }
 
 void HandlerOptionsHandler::RegisterMessages() {
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("clearDefault",
       NewCallback(this, &HandlerOptionsHandler::ClearDefault));
   web_ui_->RegisterMessageCallback("removeHandler",
       NewCallback(this, &HandlerOptionsHandler::RemoveHandler));
   web_ui_->RegisterMessageCallback("setHandlersEnabled",
       NewCallback(this, &HandlerOptionsHandler::SetHandlersEnabled));
   web_ui_->RegisterMessageCallback("setDefault",
       NewCallback(this, &HandlerOptionsHandler::SetDefault));
   web_ui_->RegisterMessageCallback("removeIgnoredHandler",
       NewCallback(this, &HandlerOptionsHandler::RemoveIgnoredHandler));
 }
 
 ProtocolHandlerRegistry* HandlerOptionsHandler::GetProtocolHandlerRegistry() {
   DCHECK(web_ui_);
-  return web_ui_->GetProfile()->GetProtocolHandlerRegistry();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  return profile->GetProtocolHandlerRegistry();
 }
 
 static void GetHandlersAsListValue(
     const ProtocolHandlerRegistry::ProtocolHandlerList& handlers,
     ListValue* handler_list) {
   ProtocolHandlerRegistry::ProtocolHandlerList::const_iterator handler;
   for (handler = handlers.begin(); handler != handlers.end(); ++handler) {
     ListValue* handlerValue = new ListValue();
     handlerValue->Append(Value::CreateStringValue(handler->protocol()));
     handlerValue->Append(Value::CreateStringValue(handler->url().spec()));
@@ skipping 112 matching lines @@
 }
 
 void HandlerOptionsHandler::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED)
     UpdateHandlerList();
   else
     NOTREACHED();
 }