Removal of Profile from content part 1.

chrome/browser/tab_contents/render_view_host_delegate_helper.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/render_view_host_delegate_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 213 matching lines @@
 
   return widget_host_view;
 }
 
 TabContents* RenderViewHostDelegateViewHelper::CreateNewWindowFromTabContents(
     TabContents* tab_contents,
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
   TabContents* new_contents = CreateNewWindow(
       route_id,
-      tab_contents->profile(),
+      Profile::FromBrowserContext(tab_contents->browser_context()),
       tab_contents->GetSiteInstance(),
       tab_contents->GetWebUITypeForCurrentState(),
       tab_contents,
       params.window_container_type,
       params.frame_name);
 
   if (new_contents) {
     content::RetargetingDetails details;
     details.source_tab_contents = tab_contents;
     details.source_frame_id = params.opener_frame_id;
@@ skipping 49 matching lines @@
     tab_contents->delegate()->RenderWidgetShowing();
 
   RenderWidgetHostView* widget_host_view = GetCreatedWidget(route_id);
   widget_host_view->InitAsFullscreen(tab_contents->GetRenderWidgetHostView());
   widget_host_view->GetRenderWidgetHost()->Init();
   return widget_host_view;
 }
 
 // static
 WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
-    Profile* profile, bool is_web_ui) {
+    content::BrowserContext* browser_context, bool is_web_ui) {
+  Profile* profile = Profile::FromBrowserContext(browser_context);
   PrefService* prefs = profile->GetPrefs();
   WebPreferences web_prefs;
 
   web_prefs.standard_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitStandardFontFamily));
   web_prefs.fixed_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitFixedFontFamily));
   web_prefs.serif_font_family =
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily));
   web_prefs.sans_serif_font_family =
@@ skipping 157 matching lines @@
     web_prefs.loads_images_automatically = true;
     web_prefs.javascript_enabled = true;
   }
 
   web_prefs.is_online = !net::NetworkChangeNotifier::IsOffline();
 
   return web_prefs;
 }
 
 void RenderViewHostDelegateHelper::UpdateInspectorSetting(
-    Profile* profile, const std::string& key, const std::string& value) {
-  DictionaryPrefUpdate update(profile->GetPrefs(),
-                              prefs::kWebKitInspectorSettings);
+    content::BrowserContext* browser_context,
+    const std::string& key,
+    const std::string& value) {
+  DictionaryPrefUpdate update(
+      Profile::FromBrowserContext(browser_context)->GetPrefs(),
+      prefs::kWebKitInspectorSettings);
   DictionaryValue* inspector_settings = update.Get();
   inspector_settings->SetWithoutPathExpansion(key,
                                               Value::CreateStringValue(value));
 }
 
-void RenderViewHostDelegateHelper::ClearInspectorSettings(Profile* profile) {
-  profile->GetPrefs()->ClearPref(prefs::kWebKitInspectorSettings);
+void RenderViewHostDelegateHelper::ClearInspectorSettings(
+    content::BrowserContext* browser_context) {
+  Profile::FromBrowserContext(browser_context)->GetPrefs()->
+      ClearPref(prefs::kWebKitInspectorSettings);
 }