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

chrome/browser/ui/browser_toolbar_model_host.h

Index: chrome/browser/ui/browser_toolbar_model_host.h
diff --git a/chrome/browser/ui/browser_toolbar_model_host.h b/chrome/browser/ui/browser_toolbar_model_host.h
new file mode 100644
index 0000000000000000000000000000000000000000..4862940b9a8c075acf8190ecce32b2dcaba7d717
--- /dev/null
+++ b/chrome/browser/ui/browser_toolbar_model_host.h
@@ -0,0 +1,31 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_BROWSER_TOOLBAR_MODEL_HOST_H_
+#define CHROME_BROWSER_UI_BROWSER_TOOLBAR_MODEL_HOST_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/ui/toolbar/toolbar_model_host.h"
+
+class Browser;
+
+// Implementation of ToolbarModelHost which uses an instance of
+// Browser in order to fulfil its duties.
+class BrowserToolbarModelHost : public ToolbarModelHost {
+ public:
+  explicit BrowserToolbarModelHost(Browser* browser);
+  virtual ~BrowserToolbarModelHost();
+
+  // ToolbarModelHost implementation:
+  virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
+
+ private:
+  Browser* browser_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserToolbarModelHost);
+};
+
+#endif  // CHROME_BROWSER_UI_BROWSER_TOOLBAR_MODEL_HOST_H_