Refactor SecurityStateModel/Clients for simplicity and reusability.

ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h

Index: ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h
diff --git a/ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h b/ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h
deleted file mode 100644
index 91be8b22081e78af463dd77f4baedaff92e6a697..0000000000000000000000000000000000000000
--- a/ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.

[rohitrao (ping after 24h), 2016/11/04 14:07:01]

This file is marked as an edit instead of a delete.  This happens occasionally,
and I don't know how to fix it other than to close this issue and create a new
one.

I don't know if the CQ will properly delete this file, or if it will delete all
the content but leave an empty file behind.

[Eric Seckler, 2016/11/04 14:17:56]

Thanks for noticing! Shall we keep an eye out for it and delete it in a
follow-up if necessary?

-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_SSL_IOS_CHROME_SECURITY_STATE_MODEL_CLIENT_H_
-#define IOS_CHROME_BROWSER_SSL_IOS_CHROME_SECURITY_STATE_MODEL_CLIENT_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "components/security_state/security_state_model.h"
-#include "components/security_state/security_state_model_client.h"
-#include "ios/web/public/web_state/web_state_user_data.h"
-
-namespace web {
-class WebState;
-}  // namespace web
-
-// Uses a WebState to provide a SecurityStateModel with the
-// information that it needs to determine the page's security status.
-class IOSChromeSecurityStateModelClient
-    : public security_state::SecurityStateModelClient,
-      public web::WebStateUserData<IOSChromeSecurityStateModelClient> {
- public:
-  ~IOSChromeSecurityStateModelClient() override;
-
-  void GetSecurityInfo(
-      security_state::SecurityStateModel::SecurityInfo* result) const;
-
-  // SecurityStateModelClient:
-  void GetVisibleSecurityState(
-      security_state::SecurityStateModel::VisibleSecurityState* state) override;
-  bool UsedPolicyInstalledCertificate() override;
-  bool IsOriginSecure(const GURL& url) override;
-
- private:
-  explicit IOSChromeSecurityStateModelClient(web::WebState* web_state);
-  friend class web::WebStateUserData<IOSChromeSecurityStateModelClient>;
-
-  web::WebState* web_state_;
-  std::unique_ptr<security_state::SecurityStateModel> security_state_model_;
-
-  DISALLOW_COPY_AND_ASSIGN(IOSChromeSecurityStateModelClient);
-};
-
-#endif  // IOS_CHROME_BROWSER_SSL_IOS_CHROME_SECURITY_STATE_MODEL_CLIENT_H_