Revert 94332 - Removal of Profile from content part 2.

chrome/browser/tab_contents/background_contents.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/tab_contents/background_contents.h"
 
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
@@ skipping 34 matching lines @@
 
 // Exposed to allow creating mocks.
 BackgroundContents::BackgroundContents()
     : delegate_(NULL),
       render_view_host_(NULL) {
 }
 
 BackgroundContents::~BackgroundContents() {
   if (!render_view_host_)   // Will be null for unit tests.
     return;
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host_->process()->browser_context());
+  Profile* profile = render_view_host_->process()->profile();
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
   render_view_host_->Shutdown();  // deletes render_view_host
 }
 
 BackgroundContents* BackgroundContents::GetAsBackgroundContents() {
   return this;
 }
@@ skipping 19 matching lines @@
 
   // Note: because BackgroundContents are only available to extension apps,
   // navigation is limited to urls within the app's extent. This is enforced in
   // RenderView::decidePolicyForNaviation. If BackgroundContents become
   // available as a part of the web platform, it probably makes sense to have
   // some way to scope navigation of a background page to its opener's security
   // origin. Note: if the first navigation is to a URL outside the app's
   // extent a background page will be opened but will remain at about:blank.
   url_ = params.url;
 
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host->process()->browser_context());
+  Profile* profile = render_view_host->process()->profile();
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
 }
 
 void BackgroundContents::RunJavaScriptMessage(
     const RenderViewHost* rvh,
     const string16& message,
     const string16& default_prompt,
@@ skipping 34 matching lines @@
                                              success,
                                              user_input);
 }
 
 gfx::NativeWindow BackgroundContents::GetDialogRootWindow() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void BackgroundContents::Close(RenderViewHost* render_view_host) {
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host->process()->browser_context());
+  Profile* profile = render_view_host->process()->profile();
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_CLOSED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
   delete this;
 }
 
 void BackgroundContents::RenderViewGone(RenderViewHost* rvh,
                                         base::TerminationStatus status,
                                         int error_code) {
-  Profile* profile =
-      Profile::FromBrowserContext(rvh->process()->browser_context());
+  Profile* profile = rvh->process()->profile();
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_TERMINATED,
       Source<Profile>(profile),
       Details<BackgroundContents>(this));
 
   // Our RenderView went away, so we should go away also, so killing the process
   // via the TaskManager doesn't permanently leave a BackgroundContents hanging
   // around the system, blocking future instances from being created
   // (http://crbug.com/65189).
   delete this;
 }
 
 RendererPreferences BackgroundContents::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   RendererPreferences preferences;
   renderer_preferences_util::UpdateFromSystemSettings(&preferences, profile);
   return preferences;
 }
 
 WebPreferences BackgroundContents::GetWebkitPrefs() {
   // TODO(rafaelw): Consider enabling the webkit_prefs.dom_paste_enabled for
   // apps.
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host_->process()->browser_context());
+  Profile* profile = render_view_host_->process()->profile();
   return RenderViewHostDelegateHelper::GetWebkitPrefs(profile,
                                                       false);  // is_web_ui
 }
 
 void BackgroundContents::CreateNewWindow(
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host_->process()->browser_context());
   delegate_view_helper_.CreateNewWindow(
       route_id,
-      profile,
+      render_view_host_->process()->profile(),
       render_view_host_->site_instance(),
-      ChromeWebUIFactory::GetInstance()->GetWebUIType(profile, url_),
+      ChromeWebUIFactory::GetInstance()->GetWebUIType(
+          render_view_host_->process()->profile(), url_),
       this,
       params.window_container_type,
       params.frame_name);
 }
 
 void BackgroundContents::CreateNewWidget(int route_id,
                                          WebKit::WebPopupType popup_type) {
   NOTREACHED();
 }
 
@@ skipping 23 matching lines @@
 BackgroundContents*
 BackgroundContents::GetBackgroundContentsByID(int render_process_id,
                                               int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
   if (!render_view_host)
     return NULL;
 
   return render_view_host->delegate()->GetAsBackgroundContents();
 }