Revert 251094 "Revert 250826 "Remove Profile dependency from app..."

trunk/src/chrome/browser/extensions/api/tabs/ash_panel_contents.cc

 // Copyright 2013 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/api/tabs/ash_panel_contents.h"
 
 #include "apps/ui/native_app_window.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "ui/gfx/image/image.h"
 
 using apps::ShellWindow;
 using apps::NativeAppWindow;
 
 // AshPanelWindowController ----------------------------------------------------
 
@@ skipping 132 matching lines @@
 
 // AshPanelContents -----------------------------------------------------
 
 AshPanelContents::AshPanelContents(ShellWindow* host)
     : host_(host) {
 }
 
 AshPanelContents::~AshPanelContents() {
 }
 
-void AshPanelContents::Initialize(Profile* profile, const GURL& url) {
+void AshPanelContents::Initialize(content::BrowserContext* context,
+                                  const GURL& url) {
   url_ = url;
 
   extension_function_dispatcher_.reset(
-      new ExtensionFunctionDispatcher(profile, this));
+      new ExtensionFunctionDispatcher(context, this));
 
-  web_contents_.reset(content::WebContents::Create(
-      content::WebContents::CreateParams(
-          profile, content::SiteInstance::CreateForURL(profile, url_))));
+  web_contents_.reset(
+      content::WebContents::Create(content::WebContents::CreateParams(
+          context, content::SiteInstance::CreateForURL(context, url_))));
 
   // Needed to give the web contents a Window ID. Extension APIs expect web
   // contents to have a Window ID. Also required for FaviconTabHelper to
   // correctly set the window icon and title.
   SessionTabHelper::CreateForWebContents(web_contents_.get());
   SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID(
       host_->session_id());
 
   // Responsible for loading favicons for the Launcher, which uses different
   // logic than the FaviconTabHelper associated with web_contents_
   // (instantiated in ShellWindow::Init())
   launcher_favicon_loader_.reset(
       new LauncherFaviconLoader(this, web_contents_.get()));
 
   content::WebContentsObserver::Observe(web_contents_.get());
 }
 
 void AshPanelContents::LoadContents(int32 creator_process_id) {
   // This must be created after the native window has been created.
-  window_controller_.reset(
-      new AshPanelWindowController(host_, host_->profile()));
+  window_controller_.reset(new AshPanelWindowController(
+      host_, Profile::FromBrowserContext(host_->browser_context())));
 
   web_contents_->GetController().LoadURL(
       url_, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
 }
 
 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) {
   if (window_controller_)
     window_controller_->NativeWindowChanged();
 }
@@ skipping 27 matching lines @@
 
 content::WebContents* AshPanelContents::GetAssociatedWebContents() const {
   return web_contents_.get();
 }
 
 void AshPanelContents::OnRequest(
     const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_->Dispatch(
       params, web_contents_->GetRenderViewHost());
 }