Removal of Profile from content part 1.

chrome/browser/extensions/extension_web_ui.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/extensions/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 111 matching lines @@
 };
 
 }  // namespace
 
 const char ExtensionWebUI::kExtensionURLOverrides[] =
     "extensions.chrome_url_overrides";
 
 ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
     : ChromeWebUI(tab_contents),
       url_(url) {
-  ExtensionService* service = tab_contents->profile()->GetExtensionService();
+  Profile* profile =
+      Profile::FromBrowserContext(tab_contents->browser_context());
+  ExtensionService* service = profile->GetExtensionService();
   const Extension* extension = service->GetExtensionByURL(url);
   if (!extension)
     extension = service->GetExtensionByWebExtent(url);
   DCHECK(extension);
   // Only hide the url for internal pages (e.g. chrome-extension or packaged
   // component apps like bookmark manager.
   should_hide_url_ = !extension->is_hosted_app();
 
   // The base class defaults to enabling web ui bindings, but we don't need
   // those.
@@ skipping 13 matching lines @@
       should_hide_url_ = false;
     }
   }
 
   // Hack: A few things we specialize just for the bookmark manager.
   if (extension->id() == extension_misc::kBookmarkManagerId) {
     TabContentsWrapper* tab =
         TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
     DCHECK(tab);
     extension_bookmark_manager_event_router_.reset(
-        new ExtensionBookmarkManagerEventRouter(GetProfile(), tab));
+        new ExtensionBookmarkManagerEventRouter(profile, tab));
 
     link_transition_type_ = PageTransition::AUTO_BOOKMARK;
   }
 }
 
 ExtensionWebUI::~ExtensionWebUI() {}
 
 ExtensionBookmarkManagerEventRouter*
 ExtensionWebUI::extension_bookmark_manager_event_router() {
   return extension_bookmark_manager_event_router_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // chrome:// URL overrides
 
 // static
 void ExtensionWebUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionURLOverrides,
                                 PrefService::UNSYNCABLE_PREF);
 }
 
 // static
-bool ExtensionWebUI::HandleChromeURLOverride(GURL* url, Profile* profile) {
+bool ExtensionWebUI::HandleChromeURLOverride(
+    GURL* url, content::BrowserContext* browser_context) {
   if (!url->SchemeIs(chrome::kChromeUIScheme))
     return false;
 
+  Profile* profile = Profile::FromBrowserContext(browser_context);
   const DictionaryValue* overrides =
       profile->GetPrefs()->GetDictionary(kExtensionURLOverrides);
   std::string page = url->host();
   ListValue* url_list;
   if (!overrides || !overrides->GetList(page, &url_list))
     return false;
 
   ExtensionService* service = profile->GetExtensionService();
 
   size_t i = 0;
@@ skipping 39 matching lines @@
       continue;
     }
 
     *url = extension_url;
     return true;
   }
   return false;
 }
 
 // static
-bool ExtensionWebUI::HandleChromeURLOverrideReverse(GURL* url,
-                                                    Profile* profile) {
+bool ExtensionWebUI::HandleChromeURLOverrideReverse(
+    GURL* url, content::BrowserContext* browser_context) {
+  Profile* profile = Profile::FromBrowserContext(browser_context);
   const DictionaryValue* overrides =
       profile->GetPrefs()->GetDictionary(kExtensionURLOverrides);
   if (!overrides)
     return false;
 
   // Find the reverse mapping based on the given URL. For example this maps the
   // internal URL chrome-extension://eemcgdkndhakfknomggombfjeno/main.html#1 to
   // chrome://bookmarks/#1 for display in the omnibox.
   for (DictionaryValue::key_iterator it = overrides->begin_keys(),
        end = overrides->end_keys(); it != end; ++it) {
@@ skipping 63 matching lines @@
 
 // static
 void ExtensionWebUI::UnregisterAndReplaceOverride(const std::string& page,
     Profile* profile, ListValue* list, Value* override) {
   int index = list->Remove(*override);
   if (index == 0) {
     // This is the active override, so we need to find all existing
     // tabs for this override and get them to reload the original URL.
     for (TabContentsIterator iterator; !iterator.done(); ++iterator) {
       TabContents* tab = (*iterator)->tab_contents();
-      if (tab->profile() != profile)
+      Profile* tab_profile =
+          Profile::FromBrowserContext(tab->browser_context());
+      if (tab_profile != profile)
         continue;
 
       GURL url = tab->GetURL();
       if (!url.SchemeIs(chrome::kChromeUIScheme) || url.host() != page)
         continue;
 
       // Don't use Reload() since |url| isn't the same as the internal URL
       // that NavigationController has.
       tab->controller().LoadURL(url, url, PageTransition::RELOAD);
     }
@@ skipping 43 matching lines @@
 }
 
 // static
 void ExtensionWebUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionWebUIImageLoadingTracker* tracker =
       new ExtensionWebUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }