Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/test/base/test_browser_window.h

Index: chrome/test/base/test_browser_window.h
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index a29b48bbe6d87654c5faeef7f4219b7f2f1965af..6411db51137a0055eb73f01d431a8236c66286ac 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -122,8 +122,7 @@ class TestBrowserWindow : public BrowserWindow {
       Profile* profile,
       content::WebContents* web_contents,
       const GURL& virtual_url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info)
-      override {}
+      const security_state::SecurityInfo& security_info) override {}
   void CutCopyPaste(int command_id) override {}
   WindowOpenDisposition GetDispositionForPopupBounds(
       const gfx::Rect& bounds) override;