Refactor SecurityStateModel/Clients for simplicity and reusability.

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

 // Copyright 2014 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/web_app_left_header_view_ash.h"
 
 #include "ash/common/frame/caption_buttons/frame_caption_button.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/chrome_security_state_model.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "components/toolbar/toolbar_model.h"
 #include "content/public/browser/navigation_entry.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/layout/box_layout.h"
 
 // static
 const char WebAppLeftHeaderView::kViewClassName[] = "WebAppLeftHeaderView";
 
@@ skipping 60 matching lines @@
   content::WebContents* tab = browser_view_->GetActiveWebContents();
   if (!tab)
     return;
 
   // Important to use GetVisibleEntry to match what's showing in the title area.
   content::NavigationEntry* nav_entry = tab->GetController().GetVisibleEntry();
   // The visible entry can be NULL in the case of window.open("").
   if (!nav_entry)
     return;
 
-  ChromeSecurityStateModelClient* security_model_client =
-      ChromeSecurityStateModelClient::FromWebContents(tab);
-  DCHECK(security_model_client);
+  ChromeSecurityStateModel* security_model =
+      ChromeSecurityStateModel::FromWebContents(tab);
+  DCHECK(security_model);
 
   security_state::SecurityStateModel::SecurityInfo security_info;
-  security_model_client->GetSecurityInfo(&security_info);
+  security_model->GetSecurityInfo(&security_info);
   chrome::ShowWebsiteSettings(browser_view_->browser(), tab,
                               nav_entry->GetVirtualURL(), security_info);
 }