Switch SecurityStateModel ownership to ChromeSecurityStateModelClient

chrome/browser/ssl/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 CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_
 #define CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_
 
 #include "base/macros.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/security_style.h"
 #include "content/public/common/ssl_status.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/x509_certificate.h"
 
 namespace content {
 class NavigationHandle;
 class WebContents;
 }  // namespace content
 
 class Profile;
 class SecurityStateModelClient;
 
 // SecurityStateModel provides high-level security information about a
-// page or request. It is attached to a WebContents and will provide the
-// security info for that WebContents.
+// 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
-    : public content::WebContentsUserData<SecurityStateModel> {
+class SecurityStateModel {
  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.chrome.browser.ssl
   // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConnectionSecurityLevel
   enum SecurityLevel {
@@ skipping 72 matching lines @@
     // are considered secure.
     bool is_secure_protocol_and_ciphersuite;
   };
 
   // These security styles 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 content::SecurityStyle kDisplayedInsecureContentStyle;
   static const content::SecurityStyle kRanInsecureContentStyle;
 
-  ~SecurityStateModel() override;
+  explicit SecurityStateModel(content::WebContents* web_contents);
+  virtual ~SecurityStateModel();
 
   // Returns a SecurityInfo describing the current page. Results are
   // cached so that computation is only done once per visible
   // NavigationEntry.
   const SecurityInfo& GetSecurityInfo() const;
 
+  void SetClient(SecurityStateModelClient* client);
+
   // Returns a SecurityInfo describing an individual request for the
   // given |profile|.
   static void SecurityInfoForRequest(
       const GURL& url,
       const content::SSLStatus& ssl,
       Profile* profile,
       const scoped_refptr<net::X509Certificate>& cert,
       bool used_known_mitm_certificate,
       SecurityInfo* security_info);
 
  private:
-  explicit SecurityStateModel(content::WebContents* web_contents);
-  friend class content::WebContentsUserData<SecurityStateModel>;
-
   // The WebContents for which this class describes the security status.
+  //
+  // TODO(estark): this should go away shortly and the model should rely
+  // on its delegate to provide whatever it needs from the
+  // WebContents. https://crbug.com/515071
   content::WebContents* web_contents_;
 
   // These data members cache the SecurityInfo for the visible
   // NavigationEntry. They are marked mutable so that the const accessor
   // GetSecurityInfo() can update the cache.
   mutable SecurityInfo security_info_;
   mutable GURL visible_url_;
   mutable content::SSLStatus visible_ssl_status_;
 
-  // TODO(estark): The SecurityStateModel temporarily owns and
-  // instantiates this member, but it will soon be injected, once the
-  // model is compnentized. https://crbug.com/515071
-  scoped_ptr<SecurityStateModelClient> client_;
+  SecurityStateModelClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityStateModel);
 };
 
 #endif  // CHROME_BROWSER_SSL_SECURITY_STATE_MODEL_H_