Removal of Profile from content part 1.

chrome/browser/ui/webui/chrome_web_ui_factory.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/chrome_web_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 244 matching lines @@
   static Type* New() {
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
       return DefaultSingletonTraits<TestType>::New();
     else
       return DefaultSingletonTraits<Type>::New();
   }
 };
 
 }  // namespace
 
-WebUI::TypeID ChromeWebUIFactory::GetWebUIType(Profile* profile,
-                                               const GURL& url) const {
+WebUI::TypeID ChromeWebUIFactory::GetWebUIType(
+      content::BrowserContext* browser_context, const GURL& url) const {
+  Profile* profile = Profile::FromBrowserContext(browser_context);
   WebUIFactoryFunction function = GetWebUIFactoryFunction(profile, url);
   return function ? reinterpret_cast<WebUI::TypeID>(function) : WebUI::kNoWebUI;
 }
 
-bool ChromeWebUIFactory::UseWebUIForURL(Profile* profile,
-                                        const GURL& url) const {
-  return GetWebUIType(profile, url) != WebUI::kNoWebUI;
+bool ChromeWebUIFactory::UseWebUIForURL(
+    content::BrowserContext* browser_context, const GURL& url) const {
+  return GetWebUIType(browser_context, url) != WebUI::kNoWebUI;
 }
 
 bool ChromeWebUIFactory::HasWebUIScheme(const GURL& url) const {
   return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          url.SchemeIs(chrome::kChromeInternalScheme) ||
          url.SchemeIs(chrome::kChromeUIScheme) ||
          url.SchemeIs(chrome::kExtensionScheme);
 }
 
 bool ChromeWebUIFactory::IsURLAcceptableForWebUI(
-    Profile* profile,
+    content::BrowserContext* browser_context,
     const GURL& url) const {
-  return UseWebUIForURL(profile, url) ||
+  return UseWebUIForURL(browser_context, url) ||
       // javacsript: URLs are allowed to run in Web UI pages
       url.SchemeIs(chrome::kJavaScriptScheme) ||
       // It's possible to load about:blank in a Web UI renderer.
       // See http://crbug.com/42547
       url.spec() == chrome::kAboutBlankURL ||
       // Chrome URLs crash, kill, hang, and shorthang are allowed.
       url == GURL(chrome::kChromeUICrashURL) ||
       url == GURL(chrome::kChromeUIKillURL) ||
       url == GURL(chrome::kChromeUIHangURL) ||
       url == GURL(chrome::kChromeUIShorthangURL);
 }
 
 WebUI* ChromeWebUIFactory::CreateWebUIForURL(
     TabContents* tab_contents,
     const GURL& url) const {
-  WebUIFactoryFunction function = GetWebUIFactoryFunction(
-      tab_contents->profile(), url);
+  Profile* profile =
+      Profile::FromBrowserContext(tab_contents->browser_context());
+  WebUIFactoryFunction function = GetWebUIFactoryFunction(profile, url);
   if (!function)
     return NULL;
   return (*function)(tab_contents, url);
 }
 
 void ChromeWebUIFactory::GetFaviconForURL(
     Profile* profile,
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url) const {
   // All extensions but the bookmark manager get their favicon from the icons
@@ skipping 72 matching lines @@
     return FlashUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
   return NULL;
 }