Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc

 // Copyright 2015 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/website_settings/website_settings_popup_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
@@ skipping 27 matching lines @@
         parent_(parent),
         profile_(profile),
         web_contents_(web_contents) {
     CreateView();
   }
 
   void CreateView() {
     if (view_)
       view_->GetWidget()->CloseNow();
 
-    security_state::SecurityStateModel::SecurityInfo security_info;
+    security_state::SecurityInfo security_info;
     views::View* anchor_view = nullptr;
     view_ =
         new WebsiteSettingsPopupView(anchor_view, parent_, profile_,
                                      web_contents_, GURL(kUrl), security_info);
   }
 
   WebsiteSettingsPopupView* view() { return view_; }
   views::View* permissions_view() { return view_->permissions_view_; }
 
   PermissionSelectorRow* GetPermissionSelectorAt(int index) {
@@ skipping 192 matching lines @@
 
   const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                              ui::EventTimeForNow(), 0, 0);
   views::ButtonListener* button_listener =
       static_cast<views::ButtonListener*>(object_view);
   button_listener->ButtonPressed(button, event);
   api_->SetPermissionInfo(list);
   EXPECT_EQ(kExpectedChildren, api_->permissions_view()->child_count());
   EXPECT_FALSE(store->HasDevicePermission(origin, origin, device));
 }