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

chrome/browser/ui/toolbar/toolbar_model.cc

 // Copyright (c) 2011 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/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 16 matching lines @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::SSLStatus;
 using content::WebContents;
 
 ToolbarModel::ToolbarModel(Browser* browser)
     : browser_(browser),
+      web_contents_(NULL),
       input_in_progress_(false) {
 }
 
+ToolbarModel::ToolbarModel(WebContents* web_contents)
+    : browser_(NULL),
+      web_contents_(web_contents),
+      input_in_progress_(false) {
+}
+
 ToolbarModel::~ToolbarModel() {
 }
 
 // ToolbarModel Implementation.
 string16 ToolbarModel::GetText() const {
   GURL url(chrome::kAboutBlankURL);
   std::string languages;  // Empty if we don't have a |navigation_controller|.
 
   NavigationController* navigation_controller = GetNavigationController();
   if (navigation_controller) {
@@ skipping 27 matching lines @@
   //   chrome://newtab's WebUI says.
   NavigationController* controller = GetNavigationController();
   NavigationEntry* entry = controller ? controller->GetVisibleEntry() : NULL;
   if (entry) {
     if (entry->IsViewSourceMode() ||
         entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL) {
       return true;
     }
   }
 
-  WebContents* web_contents = browser_->GetSelectedWebContents();
+  WebContents* web_contents = GetSelectedWebContents();
   if (web_contents && web_contents->GetWebUIForCurrentState())
     return !web_contents->GetWebUIForCurrentState()->ShouldHideURL();
 
   if (entry && entry->GetURL().SchemeIs(chrome::kExtensionScheme))
     return false;
 
   return true;
 }
 
 ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const {
@@ skipping 69 matching lines @@
   return l10n_util::GetStringFUTF16(
       IDS_SECURE_CONNECTION_EV,
       UTF8ToUTF16(cert.subject().organization_names[0]),
       UTF8ToUTF16(cert.subject().country_name));
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
-  WebContents* current_tab = browser_->GetSelectedWebContents();
+  WebContents* current_tab = GetSelectedWebContents();
   return current_tab ? &current_tab->GetController() : NULL;
 }
+
+WebContents* ToolbarModel::GetSelectedWebContents() const {
+  if (browser_)
+    return browser_->GetSelectedWebContents();
+  return web_contents_;
+}