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

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 3187 matching lines @@
         'browser/ui/panels/panel_mouse_watcher_timer.cc',
         'browser/ui/panels/panel_mouse_watcher_win.cc',
         'browser/ui/panels/panel_settings_menu_model.cc',
         'browser/ui/panels/panel_settings_menu_model.h',
         'browser/ui/panels/panel_strip.cc',
         'browser/ui/panels/panel_strip.h',
         'browser/ui/panels/panel_titlebar_view_cocoa.h',
         'browser/ui/panels/panel_titlebar_view_cocoa.mm',
         'browser/ui/panels/panel_window_controller_cocoa.h',
         'browser/ui/panels/panel_window_controller_cocoa.mm',
+        'browser/ui/prefs/prefs_tab_helper.cc',
+        'browser/ui/prefs/prefs_tab_helper.h',
         'browser/ui/profile_error_dialog.cc',
         'browser/ui/profile_error_dialog.h',
         'browser/ui/sad_tab_observer.cc',
         'browser/ui/sad_tab_observer.h',
         'browser/ui/search_engines/edit_search_engine_controller.cc',
         'browser/ui/search_engines/edit_search_engine_controller.h',
         'browser/ui/search_engines/keyword_editor_controller.cc',
         'browser/ui/search_engines/keyword_editor_controller.h',
         'browser/ui/search_engines/search_engine_tab_helper.cc',
         'browser/ui/search_engines/search_engine_tab_helper.h',
         'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
         'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
         'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc',
         'browser/ui/search_engines/template_url_fetcher_ui_callbacks.h',
         'browser/ui/search_engines/template_url_table_model.cc',
         'browser/ui/search_engines/template_url_table_model.h',
         'browser/ui/select_file_dialog.cc',
         'browser/ui/select_file_dialog.h',
         'browser/ui/status_bubble.h',
         'browser/ui/sync/browser_synced_window_delegate.h',
         'browser/ui/sync/browser_synced_window_delegate.cc',
         'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc',
         'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h',
-        'browser/ui/tab_contents/per_tab_prefs_tab_helper.cc',
-        'browser/ui/tab_contents/per_tab_prefs_tab_helper.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',
         'browser/ui/tab_contents/tab_contents_wrapper_delegate.cc',
         'browser/ui/tab_contents/tab_contents_wrapper_delegate.h',
         'browser/ui/tabs/dock_info.cc',
         'browser/ui/tabs/dock_info.h',
         'browser/ui/tabs/dock_info_aura.cc',
         'browser/ui/tabs/dock_info_gtk.cc',
         'browser/ui/tabs/dock_info_mac.cc',
         'browser/ui/tabs/dock_info_win.cc',
@@ skipping 1987 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }