Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 402 matching lines @@
 }
 
 ContentSettingBubbleModelDelegate*
 ToolbarView::GetContentSettingBubbleModelDelegate() {
   return browser_->content_setting_bubble_model_delegate();
 }
 
 void ToolbarView::ShowWebsiteSettings(
     content::WebContents* web_contents,
     const GURL& virtual_url,
-    const security_state::SecurityStateModel::SecurityInfo& security_info) {
+    const security_state::SecurityInfo& security_info) {
   chrome::ShowWebsiteSettings(browser_, web_contents, virtual_url,
                               security_info);
 }
 
 PageActionImageView* ToolbarView::CreatePageActionImageView(
     LocationBarView* owner, ExtensionAction* action) {
   return new PageActionImageView(owner, action, browser_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 344 matching lines @@
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
                                           auto_update_enabled);
   }
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }