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

trunk/src/apps/app_window_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 "apps/app_window_contents.h"
 
 #include "apps/ui/native_app_window.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 
 namespace app_window = extensions::api::app_window;
 
 namespace apps {
 
 AppWindowContents::AppWindowContents(ShellWindow* host)
     : host_(host) {
 }
 
 AppWindowContents::~AppWindowContents() {
 }
 
-void AppWindowContents::Initialize(Profile* profile, const GURL& url) {
+void AppWindowContents::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_))));
 
   content::WebContentsObserver::Observe(web_contents_.get());
   web_contents_->GetMutableRendererPrefs()->
       browser_handles_all_top_level_requests = true;
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 void AppWindowContents::LoadContents(int32 creator_process_id) {
   // If the new view is in the same process as the creator, block the created
   // RVH from loading anything until the background page has had a chance to
@@ skipping 106 matching lines @@
     content::RenderViewHost* rvh) {
   DCHECK(rvh);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
                  base::Unretained(content::ResourceDispatcherHost::Get()),
                  rvh->GetProcess()->GetID(), rvh->GetRoutingID()));
 }
 
 }  // namespace apps