Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ssl/security_state_tab_helper.h

Index: chrome/browser/ssl/security_state_tab_helper.h
diff --git a/chrome/browser/ssl/security_state_tab_helper.h b/chrome/browser/ssl/security_state_tab_helper.h
new file mode 100644
index 0000000000000000000000000000000000000000..bbf80e5b75a74cbce8ffc83eebbc06e2963151ff
--- /dev/null
+++ b/chrome/browser/ssl/security_state_tab_helper.h
@@ -0,0 +1,61 @@
+// Copyright 2015 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 CHROME_BROWSER_SSL_SECURITY_STATE_TAB_HELPER_H_
+#define CHROME_BROWSER_SSL_SECURITY_STATE_TAB_HELPER_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "components/security_state/core/security_state_model.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_contents_user_data.h"
+#include "third_party/WebKit/public/platform/WebSecurityStyle.h"
+
+namespace content {
+struct SecurityStyleExplanations;
+class NavigationHandle;
+class WebContents;
+}  // namespace content
+
+// Tab helper that uses a SecurityStateModel to provide the page's security
+// status. Also logs console warnings for private data on insecure pages.
+class SecurityStateTabHelper
+    : public content::WebContentsObserver,
+      public content::WebContentsUserData<SecurityStateTabHelper> {
+ public:
+  ~SecurityStateTabHelper() override;
+
+  // See SecurityStateModel::GetSecurityInfo.
+  void GetSecurityInfo(
+      security_state::SecurityStateModel::SecurityInfo* result) const;
+
+  // Called when the NavigationEntry's SSLStatus or other security
+  // information changes.
+  void VisibleSecurityStateChanged();
+
+  // content::WebContentsObserver:
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override;
+
+ private:
+  explicit SecurityStateTabHelper(content::WebContents* web_contents);
+  friend class content::WebContentsUserData<SecurityStateTabHelper>;
+
+  bool UsedPolicyInstalledCertificate() const;
+  bool GetMalwareStatus() const;
+  std::unique_ptr<security_state::SecurityStateModel::VisibleSecurityState>
+  GetVisibleSecurityState() const;
+
+  std::unique_ptr<security_state::SecurityStateModel> model_;

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

nit: could probably just be a SecurityStateModel, not a
unique_ptr<SecurityStateModel>

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

no longer necessary :)

+
+  // True if a console message has been logged about an omnibox warning that
+  // will be shown in future versions of Chrome for insecure HTTP pages. This
+  // message should only be logged once per main-frame navigation.
+  bool logged_http_warning_on_current_navigation_;
+
+  DISALLOW_COPY_AND_ASSIGN(SecurityStateTabHelper);
+};
+
+#endif  // CHROME_BROWSER_SSL_SECURITY_STATE_TAB_HELPER_H_