Refactor SecurityStateModel/Clients for simplicity and reusability.

components/toolbar/toolbar_model.h

Index: components/toolbar/toolbar_model.h
diff --git a/components/toolbar/toolbar_model.h b/components/toolbar/toolbar_model.h
index 48a1a8b78d8809d2764284fc357ccf38b83c3970..c8df6c632bff755e3332ee1054c94e04af87b8c2 100644
--- a/components/toolbar/toolbar_model.h
+++ b/components/toolbar/toolbar_model.h
@@ -11,7 +11,7 @@
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state.h"
 #include "url/gurl.h"
 
 namespace gfx {
@@ -40,7 +40,7 @@ class ToolbarModel {
   // |ignore_editing| is true, the result reflects the underlying state of the
   // page without regard to any user edits that may be in progress in the
   // omnibox.
-  virtual security_state::SecurityStateModel::SecurityLevel GetSecurityLevel(
+  virtual security_state::SecurityLevel GetSecurityLevel(
       bool ignore_editing) const = 0;
 
   // Returns the id of the icon to show to the left of the address, based on the