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

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class AutocompleteHistoryManager;
 class AutofillManager;
 class AutofillExternalDelegate;
 class AutomationTabHelper;
 class BlockedContentTabHelper;
 class BookmarkTabHelper;
 class ConstrainedWindowTabHelper;
 class DownloadRequestLimiterObserver;
-class Extension;
 class ExtensionTabHelper;
 class ExtensionWebNavigationTabObserver;
 class ExternalProtocolObserver;
 class FaviconTabHelper;
 class FindTabHelper;
+class HistoryTabHelper;
 class InfoBarTabHelper;
-class HistoryTabHelper;
-class NavigationController;
 class OmniboxSearchHint;
 class PasswordManager;
 class PasswordManagerDelegate;
-class PerTabPrefsTabHelper;
 class PluginObserver;
 class PrefService;
+class PrefsTabHelper;
 class Profile;
 class RestoreTabHelper;
 class SadTabObserver;
 class SearchEngineTabHelper;
 class TabContentsSSLHelper;
 class TabContentsWrapperDelegate;
 class TabContentsWrapperSyncedTabDelegate;
 class TabSpecificContentSettings;
 class ThumbnailGenerator;
 class TranslateTabHelper;
 class WebIntentPickerController;
 
-namespace browser_sync {
-class SyncedTabDelegate;
-}
-
 namespace IPC {
 class Message;
 }
 
 namespace prerender {
 class PrerenderTabHelper;
 }
 
 namespace printing {
 class PrintViewManager;
@@ skipping 97 matching lines @@
 
   const ExtensionTabHelper* extension_tab_helper() const {
     return extension_tab_helper_.get();
   }
 
   FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
   FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
   HistoryTabHelper* history_tab_helper() { return history_tab_helper_.get(); }
   InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
   PasswordManager* password_manager() { return password_manager_.get(); }
-
-  PerTabPrefsTabHelper* per_tab_prefs_tab_helper() {
-    return per_tab_prefs_tab_helper_.get();
-  }
+  PrefsTabHelper* prefs_tab_helper() { return prefs_tab_helper_.get(); }
 
   prerender::PrerenderTabHelper* prerender_tab_helper() {
     return prerender_tab_helper_.get();
   }
 
   printing::PrintViewManager* print_view_manager() {
     return print_view_manager_.get();
   }
 
   RestoreTabHelper* restore_tab_helper() {
@@ skipping 37 matching lines @@
   virtual void DidBecomeSelected() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
-  friend class PerTabPrefsTabHelper;  // for UpdateWebPreferences
   FRIEND_TEST_ALL_PREFIXES(
-      PerTabPrefsTabHelperTest, OverridePrefsOnViewCreation);
+      PrefsTabHelperTest, OverridePrefsOnViewCreation);
 
   // Internal helpers ----------------------------------------------------------
 
   // Message handlers.
   void OnSnapshot(const SkBitmap& bitmap);
   void OnPDFHasUnsupportedFeature();
 
   // Returns the server that can provide alternate error pages.  If the returned
   // URL is empty, the default error page built into WebKit will be used.
   GURL GetAlternateErrorPageURL() const;
 
   // Send the alternate error page URL to the renderer.
   void UpdateAlternateErrorPageURL(RenderViewHost* rvh);
 
-  // Update the RenderView's WebPreferences.
-  void UpdateWebPreferences();
-
-  // Update the TabContents's RendererPreferences.
-  void UpdateRendererPreferences();
-
   // Create or destroy SafebrowsingDetectionHost as needed if the user's
   // safe browsing preference has changed.
   void UpdateSafebrowsingDetectionHost();
 
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   TabContentsWrapperDelegate* delegate_;
 
   content::NotificationRegistrar registrar_;
@@ skipping 20 matching lines @@
   scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<FindTabHelper> find_tab_helper_;
   scoped_ptr<HistoryTabHelper> history_tab_helper_;
   scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
 
-  scoped_ptr<PerTabPrefsTabHelper> per_tab_prefs_tab_helper_;
+  scoped_ptr<PrefsTabHelper> prefs_tab_helper_;
   scoped_ptr<prerender::PrerenderTabHelper> prerender_tab_helper_;
 
   // Handles print job for this contents.
   scoped_ptr<printing::PrintViewManager> print_view_manager_;
 
   scoped_ptr<RestoreTabHelper> restore_tab_helper_;
 
   // Handles displaying a web intents picker to the user.
   scoped_ptr<WebIntentPickerController> web_intent_picker_controller_;
 
@@ skipping 30 matching lines @@
 
   // The supporting objects need to outlive the TabContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<TabContents> tab_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_