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

chrome/browser/ui/browser_toolbar_model_delegate.cc

Index: chrome/browser/ui/browser_toolbar_model_delegate.cc
diff --git a/chrome/browser/ui/browser_toolbar_model_delegate.cc b/chrome/browser/ui/browser_toolbar_model_delegate.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e93f33b4a32e7d0ba0b5d7d2497f4ee8b106c95a
--- /dev/null
+++ b/chrome/browser/ui/browser_toolbar_model_delegate.cc
@@ -0,0 +1,19 @@
+// 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.
+
+#include "chrome/browser/ui/browser_toolbar_model_delegate.h"
+
+#include "chrome/browser/ui/browser.h"
+
+BrowserToolbarModelDelegate::BrowserToolbarModelDelegate(Browser* browser)
+    : browser_(browser) {
+}
+
+BrowserToolbarModelDelegate::~BrowserToolbarModelDelegate() {
+}
+
+content::WebContents*
+BrowserToolbarModelDelegate::GetActiveWebContents() const {
+  return browser_->GetSelectedWebContents();
+}