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..61aad7b3a4c3a8ad9e0347141f4248f1dcb6348d 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_model.h
@@ -15,6 +15,7 @@ class Browser;
 
 namespace content {
 class NavigationController;
+class WebContents;
 }
 
 namespace net {
@@ -40,6 +41,7 @@ class ToolbarModel {
   };
 
   explicit ToolbarModel(Browser* browser);

[sky, 2012/02/28 18:24:24]

I don't like having these two modes, it's too error prone and going to break.

If you're going to remove dependencies you need to remove Browser entirely. If
you need to introduce an interface that is used to get things from Browser, do
that.

[altimofeev, 2012/02/29 18:57:29]

Done. See TabContentsWrapperContainer interface.

+  explicit ToolbarModel(content::WebContents* web_contents);
   ~ToolbarModel();
 
   // Returns the text that should be displayed in the location bar.
@@ -75,7 +77,10 @@ class ToolbarModel {
   // If this returns NULL, default values are used.
   content::NavigationController* GetNavigationController() const;
 
+  content::WebContents* GetSelectedWebContents() const;
+
   Browser* browser_;
+  content::WebContents* web_contents_;
 
   // Whether the text in the location bar is currently being edited.
   bool input_in_progress_;