Re-factor location bar/toolbar code to get rid of the browser dependency.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2639 matching lines @@
         'browser/ui/browser_init.cc',
         'browser/ui/browser_init.h',
         'browser/ui/browser_list.cc',
         'browser/ui/browser_list.h',
         'browser/ui/browser_list_gtk.cc',
         'browser/ui/browser_list_mac.mm',
         'browser/ui/browser_list_stub.cc',
         'browser/ui/browser_list_win.cc',
         'browser/ui/browser_navigator.cc',
         'browser/ui/browser_navigator.h',
+        'browser/ui/browser_content_setting_bubble_model_delegate.cc',
+        'browser/ui/browser_content_setting_bubble_model_delegate.h',
+        'browser/ui/browser_tab_contents_wrapper_container.cc',
+        'browser/ui/browser_tab_contents_wrapper_container.h',
         'browser/ui/browser_tab_restore_service_delegate.cc',
         'browser/ui/browser_tab_restore_service_delegate.h',
         'browser/ui/browser_window.h',
         'browser/ui/certificate_dialogs.cc',
         'browser/ui/certificate_dialogs.h',
         'browser/ui/cocoa/about_ipc_controller.h',
         'browser/ui/cocoa/about_ipc_controller.mm',
         'browser/ui/cocoa/about_ipc_dialog.h',
         'browser/ui/cocoa/about_ipc_dialog.mm',
         'browser/ui/cocoa/about_window_controller.h',
@@ skipping 818 matching lines @@
         'browser/ui/sync/one_click_signin_sync_starter.cc',
         'browser/ui/sync/one_click_signin_sync_starter.h',
         'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc',
         'browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h',
         'browser/ui/tab_contents/core_tab_helper.cc',
         'browser/ui/tab_contents/core_tab_helper.h',
         'browser/ui/tab_contents/core_tab_helper_delegate.cc',
         'browser/ui/tab_contents/core_tab_helper_delegate.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',
+        'browser/ui/tab_contents/tab_contents_wrapper_container.h',
         'browser/ui/tab_modal_confirm_dialog_delegate.cc',
         'browser/ui/tab_modal_confirm_dialog_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',
         'browser/ui/tabs/hover_tab_selector.cc',
         'browser/ui/tabs/hover_tab_selector.h',
@@ skipping 2199 matching lines @@
          'variables': {
           'proto_in_dir': '../third_party/cros_system_api/dbus/',
           'proto_out_dir': 'chrome/browser/chromeos/dbus',
          },
          'includes': ['../build/protoc.gypi'],
         }],
       ],
     },
   ],
 }