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

chrome/browser/ui/toolbar/toolbar_model.h

Index: chrome/browser/ui/toolbar/toolbar_model.h
diff --git a/chrome/browser/ui/toolbar/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h
index e15fed6129aac66870fdcdec876004c5ff95dac2..0e914e487f446974cedff48534836882376b2f54 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_model.h
@@ -11,10 +11,11 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 
-class Browser;
+class TabContentsWrapperContainer;
 
 namespace content {
 class NavigationController;
+class WebContents;
 }
 
 namespace net {
@@ -39,7 +40,7 @@ class ToolbarModel {
     NUM_SECURITY_LEVELS,
   };
 
-  explicit ToolbarModel(Browser* browser);
+  explicit ToolbarModel(TabContentsWrapperContainer* container);
   ~ToolbarModel();
 
   // Returns the text that should be displayed in the location bar.
@@ -75,7 +76,9 @@ class ToolbarModel {
   // If this returns NULL, default values are used.
   content::NavigationController* GetNavigationController() const;
 
-  Browser* browser_;
+  content::WebContents* GetSelectedWebContents() const;
+
+  TabContentsWrapperContainer* container_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;