Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/browser_commands.h

Index: chrome/browser/ui/browser_commands.h
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index 984144b0ed72218fe877fdc14df7ad55711fc3bc..1fa96e04914e232d9dfa4bc693df0ea00c0eaefb 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -10,7 +10,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state_model.h"

[estark, 2016/11/02 05:22:02]

Looks like you could just delete this and forward-declare SecurityInfo instead.

[Eric Seckler, 2016/11/02 09:56:53]

I think that only works if we move SecurityInfo out of SecurityStateModel (it's
a nested class at the moment). WDYT?

[estark, 2016/11/03 04:38:45]

Oh, that's right -- fine to leave as is. However, I left a comment in
security_state_model.h; I do think we might want to remove SecurityStateModel
the class (not necessarily in this CL) and replace it with a couple constants,
structs, and a GetSecurityInfo() utility function. If we do that later, we'll
have to come back and replace all
security_state::SecurityStateModel::SecurityInfo references with
security_state::SecurityInfo. So, if you want to do that now, it might save some
time later, but not necessary to do now IMO.

[Eric Seckler, 2016/11/03 17:01:06]

You're right, makes sense to do it in one review. SecurityStateModel is no more,
includes replaced by forward-decls. Hope I got them all :)

 #include "content/public/common/page_zoom.h"
 #include "ui/base/window_open_disposition.h"