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

content/test/test_web_contents.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_
 
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/web_preferences.h"
@@ skipping 24 matching lines @@
   virtual void ProceedWithCrossSiteNavigation() OVERRIDE;
   virtual void TestDidNavigate(RenderViewHost* render_view_host,
                                int page_id,
                                const GURL& url,
                                PageTransition transition) OVERRIDE;
   virtual void TestDidNavigateWithReferrer(RenderViewHost* render_view_host,
                                            int page_id,
                                            const GURL& url,
                                            const Referrer& referrer,
                                            PageTransition transition) OVERRIDE;
-  virtual WebPreferences TestComputeWebkitPrefs() OVERRIDE;
+  virtual WebPreferences TestGetWebkitPrefs() OVERRIDE;
 
   TestRenderViewHost* pending_test_rvh() const;
 
   // State accessor.
   bool cross_navigation_pending() {
     return GetRenderManager()->cross_navigation_pending_;
   }
 
   // Prevent interaction with views.
   virtual bool CreateRenderViewForRenderManager(
@@ skipping 69 matching lines @@
   bool expect_set_history_length_and_prune_;
   scoped_refptr<const SiteInstanceImpl>
     expect_set_history_length_and_prune_site_instance_;
   int expect_set_history_length_and_prune_history_length_;
   int32 expect_set_history_length_and_prune_min_page_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_WEB_CONTENTS_H_