Split captive portal metrics out of SSLErrorClassification

chrome/browser/ssl/ssl_error_classification.h

 // Copyright 2014 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_SSL_ERROR_CLASSIFICATION_H_
 #define CHROME_BROWSER_SSL_SSL_ERROR_CLASSIFICATION_H_
 
 #include <string>
 #include <vector>
 
 #include "base/time/time.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "net/cert/x509_certificate.h"
 #include "url/gurl.h"
 
-namespace content {
-class WebContents;
-}
-
-// This class classifies characteristics of SSL errors, including information
-// about captive portal detection.
-//
-// This class should only be used on the UI thread because its
-// implementation uses captive_portal::CaptivePortalService which can only be
-// accessed on the UI thread.
-class SSLErrorClassification : public content::NotificationObserver {
+class SSLErrorClassification {

[estark, 2015/09/25 23:53:35]

Are you planning to leave this as a class, or turn it into a namespace of static
methods? (If the former, maybe leave some comment on it.)

[felt, 2015/09/27 20:08:15]

I'm going to turn it into a namespace of static methods in my next CL. Also, I
don't think the comment adds anything: it's named SSLErrorClassification and the
comment says it "classifies characteristics of SSL errors," which is the same
words in a different order.

  public:
-  SSLErrorClassification(content::WebContents* web_contents,
-                         const base::Time& current_time,
+  SSLErrorClassification(const base::Time& current_time,
                          const GURL& url,
                          int cert_error,
                          const net::X509Certificate& cert);
-  ~SSLErrorClassification() override;
+  ~SSLErrorClassification();
 
   // Returns true if the system time is in the past.
   static bool IsUserClockInThePast(const base::Time& time_now);
 
   // Returns true if the system time is too far in the future or the user is
   // using a version of Chrome which is more than 1 year old.
   static bool IsUserClockInTheFuture(const base::Time& time_now);
 
   // Sets a clock for browser tests that check the build time. Used by
   // IsUserClockInThePast and IsUserClockInTheFuture.
@@ skipping 10 matching lines @@
   //
   //     www.example.com ~ example.com -> true
   //     example.com ~ www.example.com -> true
   //     www.food.example.com ~ example.com -> false
   //     mail.example.com ~ example.com -> false
   static bool GetWWWSubDomainMatch(const std::string& host_name,
                                    const std::vector<std::string>& dns_names,
                                    std::string* www_match_host_name);
 
   void RecordUMAStatistics(bool overridable) const;
-  void RecordCaptivePortalUMAStatistics(bool overridable) const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, TestDateInvalidScore);
   FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, TestNameMismatch);
   FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest,
                            TestHostNameHasKnownTLD);
   FRIEND_TEST_ALL_PREFIXES(SSLErrorClassificationTest, TestPrivateURL);
 
   typedef std::vector<std::string> Tokens;
 
@@ skipping 48 matching lines @@
   // For example,
   //
   //   FindSubDomainDifference(Tokenize("a.b.example.com"),
   //                           Tokenize("example.com"))
   // --> 2.
   size_t FindSubDomainDifference(const Tokens& potential_subdomain,
                                  const Tokens& parent) const;
 
   static Tokens Tokenize(const std::string& name);
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  content::WebContents* web_contents_;
   base::Time current_time_;
   const GURL request_url_;
   int cert_error_;
   const net::X509Certificate& cert_;
-  bool captive_portal_detection_enabled_;
-  // Did the probe complete before the interstitial was closed?
-  bool captive_portal_probe_completed_;
-  // Did the captive portal probe receive an error or get a non-HTTP response?
-  bool captive_portal_no_response_;
-  bool captive_portal_detected_;
-
-  content::NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_ERROR_CLASSIFICATION_H_