Refactor SecurityStateModel/Clients for simplicity and reusability.

components/toolbar/toolbar_model.h

 // Copyright 2012 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.
 
 #ifndef COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_
 #define COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #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 {
 enum class VectorIconId;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
 // edit.  It populates its states from the current navigation entry retrieved
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModel {
  public:
   virtual ~ToolbarModel() = default;
 
   // Returns a formatted URL for display in the toolbar. The formatting
   // includes:
   //   - Some characters may be unescaped.
   //   - The scheme and/or trailing slash may be dropped.
   // If |prefix_end| is non-NULL, it is set to the length of the pre-hostname
   // portion of the resulting URL.
   virtual base::string16 GetFormattedURL(size_t* prefix_end) const = 0;
 
   // Returns the URL of the current navigation entry.
   virtual GURL GetURL() const = 0;
 
   // Returns the security level that the toolbar should display.  If
   // |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
   // current URL.  When search term replacement is active, this returns a search
   // icon.  This doesn't cover specialized icons while the user is editing; see
   // OmniboxView::GetVectorIcon().
   virtual gfx::VectorIconId GetVectorIcon() const = 0;
 
   // Returns text for the omnibox secure verbose chip.
   virtual base::string16 GetSecureVerboseText() const = 0;
@@ skipping 15 matching lines @@
  protected:
   ToolbarModel() : input_in_progress_(false) {}
 
  private:
   bool input_in_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModel);
 };
 
 #endif  // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_