Refactor SecurityStateModel/Clients for simplicity and reusability.

components/security_state/core/security_state_model.h

 // 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 COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 
 #include <stdint.h>
+#include <memory>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "url/gurl.h"
 
 namespace security_state {
 
-class SecurityStateModelClient;
-
 // SecurityStateModel provides high-level security information about a
 // page or request.
 //
 // SecurityStateModel::SecurityInfo is the main data structure computed
 // by a SecurityStateModel. SecurityInfo contains a SecurityLevel (which
 // is a single value describing the overall security state) along with
 // information that a consumer might want to display in UI to explain or
 // elaborate on the SecurityLevel.
 class SecurityStateModel {

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

I'll just note, there's no reason AFAICT for this to be a class anymore; it
doesn't have any state and is essentially just the utility function
GetSecurityState.

We can clean that up in a follow-up CL though (I can do it if you'd prefer).

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

Class is gone :)

  public:
   // Describes the overall security state of the page.
   //
   // If you reorder, add, or delete values from this enum, you must also
   // update the UI icons in ToolbarModelImpl::GetIconForSecurityLevel.
   //
   // A Java counterpart will be generated for this enum.
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.security_state
   // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel
   enum SecurityLevel {
@@ skipping 98 matching lines @@
     // True if pinning was bypassed due to a local trust anchor.
     bool pkp_bypassed;
 
     // True if the page displayed sensitive user data inputs (like a
     // password or credit card) on an HTTP page.
     bool displayed_private_user_data_input_on_http;
   };
 
   // Contains the security state relevant to computing the SecurityInfo
   // for a page. This is the input to GetSecurityInfo() provided by the
-  // model's client.
+  // model's user.
   struct VisibleSecurityState {
     VisibleSecurityState();
     ~VisibleSecurityState();
     bool operator==(const VisibleSecurityState& other) const;
     GURL url;
 
     // True if the page fails the browser's malware or phishing checks.
     bool fails_malware_check;
 
     // CONNECTION SECURITY FIELDS
@@ skipping 29 matching lines @@
 
   // These security levels describe the treatment given to pages that
   // display and run mixed content. They are used to coordinate the
   // treatment of mixed content with other security UI elements.
   static const SecurityLevel kDisplayedInsecureContentLevel;
   static const SecurityLevel kRanInsecureContentLevel;
 
   SecurityStateModel();
   virtual ~SecurityStateModel();
 
+  // Returns true if the given |url|'s origin should be considered secure.
+  using IsOriginSecureCallback = base::Callback<bool(const GURL& url)>;
+
   // Populates |result| to describe the current page.
-  void GetSecurityInfo(SecurityInfo* result) const;
-
-  void SetClient(SecurityStateModelClient* client);
+  // |visible_security_state| contains the relevant security state.
+  // |used_policy_installed_certificate| indicates whether the page or request
+  // is known to be loaded with a certificate installed by the system admin.
+  // |is_origin_secure_callback| determines whether a URL's origin should be
+  // considered secure.
+  void GetSecurityInfo(
+      SecurityInfo* result,

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

optional nit: I think putting the output parameter |result| at the end of the
argument list would be more conventional

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

Done.

+      std::unique_ptr<VisibleSecurityState> visible_security_state,
+      bool used_policy_installed_certificate,
+      IsOriginSecureCallback is_origin_secure_callback) const;
 
  private:
-  SecurityStateModelClient* client_;
-
   DISALLOW_COPY_AND_ASSIGN(SecurityStateModel);
 };
 
 }  // namespace security_state
 
 #endif  // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_