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..1acb0b873fbae7bcee4c8ea172ca567208ce8131
--- /dev/null
+++ b/chrome/browser/ssl/security_state_tab_helper.h
@@ -0,0 +1,62 @@
+// 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
+
+// Uses a WebContents to provide a SecurityStateModel with the

[estark, 2016/11/02 05:22:02]

Can you update this comment, please?

[Eric Seckler, 2016/11/02 09:56:52]

Done. Let me know if you had something else in mind, though :)

+// information that it needs to determine the page's security status.
+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_;
+
+  // True if a console has been logged about an omnibox warning that

[estark, 2016/11/02 05:22:02]

Sorry, I know this typo was here before, but while you're here, there's a word
missing ("console" => "console message"), would you mind fixing it?

[Eric Seckler, 2016/11/02 09:56:52]

Done.

+  // 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_