Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/location_bar/location_icon_view.cc

 // 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/views/location_bar/location_icon_view.h"
 
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/chrome_security_state_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 87 matching lines @@
   WebContents* contents = location_bar_->GetWebContents();
   if (!contents)
     return false;
 
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   NavigationEntry* entry = contents->GetController().GetVisibleEntry();
   // The visible entry can be nullptr in the case of window.open("").
   if (!entry)
     return false;
 
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(contents);
-  DCHECK(model_client);
+  ChromeSecurityStateModel* model =
+      ChromeSecurityStateModel::FromWebContents(contents);
+  DCHECK(model);
   security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
+  model->GetSecurityInfo(&security_info);
 
   location_bar_->delegate()->ShowWebsiteSettings(
       contents, entry->GetVirtualURL(), security_info);
   return true;
 }
 
 gfx::Size LocationIconView::GetMinimumSizeForLabelText(
     const base::string16& text) const {
   views::Label label(text, font_list());
   return GetMinimumSizeForPreferredSize(
@@ skipping 34 matching lines @@
   return size;
 }
 
 void LocationIconView::OnClickOrTap(const ui::LocatedEvent& event) {
   // Do not show page info if the user has been editing the location bar or the
   // location bar is at the NTP.
   if (location_bar_->GetOmniboxView()->IsEditingOrEmpty())
     return;
   ProcessLocatedEvent(event);
 }