re-apply r34183...

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2009 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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 189 matching lines @@
   // enable extensions by default before databases, if necessary.
   // TODO(aa): This should be removed when local storage and databases are
   // enabled by default (bugs 4359 and 4360).
   WebPreferences webkit_prefs = delegate_->GetWebkitPrefs();
   if (delegate_->GetURL().SchemeIs(chrome::kExtensionScheme)) {
     webkit_prefs.local_storage_enabled = true;
     webkit_prefs.databases_enabled = true;
   }
 
   Send(new ViewMsg_New(GetNativeViewId(),
-                       delegate_->GetRendererPrefs(),
+                       delegate_->GetRendererPrefs(process()->profile()),
                        webkit_prefs,
                        routing_id()));
 
   // Set the alternate error page, which is profile specific, in the renderer.
   GURL url = delegate_->GetAlternateErrorPageURL();
   SetAlternateErrorPageURL(url);
 
   // If it's enabled, tell the renderer to set up the Javascript bindings for
   // sending messages back to the browser.
   Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_));
   UpdateBrowserWindowId(delegate_->GetBrowserWindowID());
   Send(new ViewMsg_NotifyRenderViewType(routing_id(),
                                         delegate_->GetRenderViewType()));
   // Let our delegate know that we created a RenderView.
   delegate_->RenderViewCreated(this);
   process()->ViewCreated();
 
   return true;
 }
 
 bool RenderViewHost::IsRenderViewLive() const {
   return process()->HasConnection() && renderer_initialized_;
 }
 
 void RenderViewHost::SyncRendererPrefs() {
   Send(new ViewMsg_SetRendererPrefs(routing_id(),
-                                    delegate_->GetRendererPrefs()));
+                                    delegate_->GetRendererPrefs(
+                                        process()->profile())));
 }
 
 void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
   ChildProcessSecurityPolicy::GetInstance()->GrantRequestURL(
       process()->id(), params.url);
 
   ViewMsg_Navigate* nav_message = new ViewMsg_Navigate(routing_id(), params);
 
   // Only send the message if we aren't suspended at the start of a cross-site
   // request.
@@ skipping 1530 matching lines @@
   BrowserAccessibilityManager::GetInstance()->ChangeAccessibilityFocus(
       acc_obj_id, process()->id(), routing_id());
 #else
   // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #endif
 }
 
 void RenderViewHost::OnCSSInserted() {
   delegate_->DidInsertCSS();
 }