Revert 284592 "Cache the current WebPreferences on RenderViewHos..."

content/test/test_web_contents.cc

 // Copyright (c) 2012 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 "content/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
@@ skipping 73 matching lines @@
   params.was_within_same_page = false;
   params.is_post = false;
   params.page_state = PageState::CreateFromURL(url);
 
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(render_view_host);
   RenderFrameHostImpl* rfh = RenderFrameHostImpl::FromID(
       rvh->GetProcess()->GetID(), rvh->main_frame_routing_id());
   frame_tree_.root()->navigator()->DidNavigate(rfh, params);
 }
 
-WebPreferences TestWebContents::TestComputeWebkitPrefs() {
-  return ComputeWebkitPrefs();
+WebPreferences TestWebContents::TestGetWebkitPrefs() {
+  return GetWebkitPrefs();
 }
 
 bool TestWebContents::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host,
     int opener_route_id,
     int proxy_routing_id,
     bool for_main_frame) {
   UpdateMaxPageIDIfNecessary(render_view_host);
   // This will go to a TestRenderViewHost.
   static_cast<RenderViewHostImpl*>(
@@ skipping 141 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content