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

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 94e33796184012859d94e9493f81ec60cfc0bc10..98d781e03c49105bd936819bffceca6543136465 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -52,7 +52,9 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
+class BrowserContentSettingBubbleModelDelegate;
 class BrowserSyncedWindowDelegate;
+class BrowserTabContentsWrapperContainer;
 class BrowserTabRestoreServiceDelegate;
 class BrowserWindow;
 class Extension;
@@ -234,10 +236,17 @@ class Browser : public TabHandlerDelegate,
   // |window()| will return NULL if called before |CreateBrowserWindow()|
   // is done.
   BrowserWindow* window() const { return window_; }
-  ToolbarModel* toolbar_model() { return &toolbar_model_; }
+  ToolbarModel* toolbar_model() { return toolbar_model_.get(); }
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
   bool block_command_execution() const { return block_command_execution_; }
+  BrowserContentSettingBubbleModelDelegate*
+      content_setting_bubble_model_delegate() {
+    return content_setting_bubble_model_delegate_.get();
+  }
+  BrowserTabContentsWrapperContainer* tab_contents_wrapper_container() {
+    return tab_contents_wrapper_container_.get();
+  }
   BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() {
     return tab_restore_service_delegate_.get();
   }
@@ -1361,7 +1370,7 @@ class Browser : public TabHandlerDelegate,
   const SessionID session_id_;
 
   // The model for the toolbar view.
-  ToolbarModel toolbar_model_;
+  scoped_ptr<ToolbarModel> toolbar_model_;
 
   // UI update coalescing and handling ////////////////////////////////////////
 
@@ -1455,6 +1464,14 @@ class Browser : public TabHandlerDelegate,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
+  // Helper which implements the ContentSettingBubbleModel interface.
+  scoped_ptr<BrowserContentSettingBubbleModelDelegate>
+      content_setting_bubble_model_delegate_;
+
+  // Helper which implements the TabContentsWrapperContainer interface.
+  scoped_ptr<BrowserTabContentsWrapperContainer>
+      tab_contents_wrapper_container_;
+
   // Helper which implements the TabRestoreServiceDelegate interface.
   scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;