Make PerTabPrefsTabHelper into PrefsTabHelper, move all prefs code into it.

chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc

Index: chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
diff --git a/chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper_unittest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
similarity index 58%
rename from chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper_unittest.cc
rename to chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
index f8c5869d9cf07a18352b26dad9233454d325bad0..dd1dd3805b3bf5bbf82213bf84d9a1e20136ff6e 100644
--- a/chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper_unittest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/common/pref_names.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/ui/tab_contents/per_tab_prefs_tab_helper.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
@@ -12,38 +12,38 @@
 
 using content::BrowserThread;
 
-class TestPerTabPrefsTabHelper : public PerTabPrefsTabHelper {
+class TestPrefsTabHelper : public PrefsTabHelper {
  public:
-  explicit TestPerTabPrefsTabHelper(TabContentsWrapper* tab_contents)
-      : PerTabPrefsTabHelper(tab_contents),
-        was_override_web_prefernces_called_(false) {
+  explicit TestPrefsTabHelper(TabContentsWrapper* tab_contents)
+      : PrefsTabHelper(tab_contents),
+        was_update_web_preferences_called_(false) {
   }
-  virtual ~TestPerTabPrefsTabHelper() { }
+  virtual ~TestPrefsTabHelper() { }
 
-  virtual void OverrideWebPreferences(WebPreferences* prefs) OVERRIDE {
-    was_override_web_prefernces_called_ = true;
-    PerTabPrefsTabHelper::OverrideWebPreferences(prefs);
+  virtual void UpdateWebPreferences() OVERRIDE {
+    was_update_web_preferences_called_ = true;
+    PrefsTabHelper::UpdateWebPreferences();
   }
 
   void NotifyRenderViewCreated() {
     RenderViewCreated(NULL);
   }
 
-  bool was_override_web_prefernces_called() {
-    return was_override_web_prefernces_called_;
+  bool was_update_web_preferences_called() {
+    return was_update_web_preferences_called_;
   }
 
  private:
-  bool was_override_web_prefernces_called_;
+  bool was_update_web_preferences_called_;
 };
 
-class PerTabPrefsTabHelperTest : public TabContentsWrapperTestHarness {
+class PrefsTabHelperTest : public TabContentsWrapperTestHarness {
  public:
-  PerTabPrefsTabHelperTest()
+  PrefsTabHelperTest()
       : TabContentsWrapperTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_) {}
 
-  virtual ~PerTabPrefsTabHelperTest() {}
+  virtual ~PrefsTabHelperTest() {}
 
   TabContentsWrapper* contents_wrapper2() {
     return contents_wrapper2_.get();
@@ -69,14 +69,14 @@ class PerTabPrefsTabHelperTest : public TabContentsWrapperTestHarness {
   content::TestBrowserThread ui_thread_;
   scoped_ptr<TabContentsWrapper> contents_wrapper2_;
 
-  DISALLOW_COPY_AND_ASSIGN(PerTabPrefsTabHelperTest);
+  DISALLOW_COPY_AND_ASSIGN(PrefsTabHelperTest);
 };
 
-TEST_F(PerTabPrefsTabHelperTest, PerTabJavaScriptEnabled) {
+TEST_F(PrefsTabHelperTest, PerTabJavaScriptEnabled) {
   const char* key = prefs::kWebKitJavascriptEnabled;
-  PrefService* prefs1 = contents_wrapper()->per_tab_prefs_tab_helper()->prefs();
+  PrefService* prefs1 = contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
   PrefService* prefs2 =
-      contents_wrapper2()->per_tab_prefs_tab_helper()->prefs();
+      contents_wrapper2()->prefs_tab_helper()->per_tab_prefs();
   const bool initial_value = prefs1->GetBoolean(key);
   EXPECT_EQ(initial_value, prefs2->GetBoolean(key));
 
@@ -93,11 +93,11 @@ TEST_F(PerTabPrefsTabHelperTest, PerTabJavaScriptEnabled) {
   EXPECT_EQ(!initial_value, prefs2->GetBoolean(key));
 }
 
-TEST_F(PerTabPrefsTabHelperTest, OverridePrefsOnViewCreation) {
-  TestPerTabPrefsTabHelper* test_prefs_helper = new TestPerTabPrefsTabHelper(
-      contents_wrapper());
-  contents_wrapper()->per_tab_prefs_tab_helper_.reset(test_prefs_helper);
-  EXPECT_FALSE(test_prefs_helper->was_override_web_prefernces_called());
+TEST_F(PrefsTabHelperTest, OverridePrefsOnViewCreation) {
+  TestPrefsTabHelper* test_prefs_helper =
+      new TestPrefsTabHelper(contents_wrapper());
+  contents_wrapper()->prefs_tab_helper_.reset(test_prefs_helper);
+  EXPECT_FALSE(test_prefs_helper->was_update_web_preferences_called());
   test_prefs_helper->NotifyRenderViewCreated();
-  EXPECT_TRUE(test_prefs_helper->was_override_web_prefernces_called());
+  EXPECT_TRUE(test_prefs_helper->was_update_web_preferences_called());
 }