Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1262 matching lines @@
 }
 
 void BrowserView::UserChangedTheme() {
   frame_->FrameTypeChanged();
 }
 
 void BrowserView::ShowWebsiteSettings(
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& virtual_url,
-    const security_state::SecurityStateModel::SecurityInfo& security_info) {
+    const security_state::SecurityInfo& security_info) {
   // Some browser windows have a location icon embedded in the frame. Try to
   // use that if it exists. If it doesn't exist, use the location icon from
   // the location bar.
   views::View* popup_anchor =
       ui::MaterialDesignController::IsSecondaryUiMaterial()
           ? toolbar_->location_bar()
           : frame_->GetLocationIconView();
   if (!popup_anchor)
     popup_anchor = GetLocationBarView()->location_icon_view()->GetImageView();
 
@@ skipping 1295 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }