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_model.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 {
@@ skipping 44 matching lines @@
  protected:
   ToolbarModel() : input_in_progress_(false) {}
 
  private:
   bool input_in_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModel);
 };
 
 #endif  // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_