Eliminate remaining usage of CAPTIVE_PORTAL_CHECK_RESULT notification

The sending of the CAPTIVE_PORTAL_CHECK_RESULT notification is a
blocker to the ongoing effort to componentize CaptivePortalService. A
previous CL has introduced the ability to register for a callback with
CaptivePortalService as an alternative mechanism of being informed on
the results of captive portal queries. This CL converts the remaining
consumers and eliminates the notification.

Bug: 1030692
Change-Id: I9a2c5f6190922eb6ddb10d572dcbec6b52ffc3ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012383
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734407}

chrome/browser/captive_portal/captive_portal_service.cc

@@ -10,13 +10,11 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/time/tick_clock.h"
 #include "build/build_config.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "components/captive_portal/core/captive_portal_types.h"
 #include "components/embedder_support/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
@@ -363,11 +361,6 @@ void CaptivePortalService::OnResult(CaptivePortalResult result,
   results.landing_url = landing_url;
   last_detection_result_ = result;
 
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-      content::Source<content::BrowserContext>(browser_context_),
-      content::Details<Results>(&results));
-
   callback_list_.Notify(results);
 }
 

chrome/browser/captive_portal/captive_portal_tab_helper.cc

@@ -9,7 +9,6 @@
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -17,10 +16,6 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -42,10 +37,12 @@ CaptivePortalTabHelper::CaptivePortalTabHelper(
                      web_contents,
                      false))),
       login_detector_(new CaptivePortalLoginDetector(profile_)),
-      is_captive_portal_window_(false) {
+      is_captive_portal_window_(false),
+      subscription_(
+          CaptivePortalServiceFactory::GetForProfile(profile_)
+              ->RegisterCallback(base::Bind(&CaptivePortalTabHelper::Observe,
+                                            base::Unretained(this)))) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  registrar_.Add(this, chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-                 content::Source<content::BrowserContext>(profile_));
 }
 
 CaptivePortalTabHelper::~CaptivePortalTabHelper() {
@@ -130,17 +127,10 @@ void CaptivePortalTabHelper::DidStopLoading() {
 }
 
 void CaptivePortalTabHelper::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+    const CaptivePortalService::Results& results) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK_EQ(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, type);
-  DCHECK_EQ(profile_, content::Source<content::BrowserContext>(source).ptr());
 
-  const CaptivePortalService::Results* results =
-      content::Details<CaptivePortalService::Results>(details).ptr();
-
-  OnCaptivePortalResults(results->previous_result, results->result);
+  OnCaptivePortalResults(results.previous_result, results.result);
 }
 
 void CaptivePortalTabHelper::OnSSLCertError(const net::SSLInfo& ssl_info) {

chrome/browser/captive_portal/captive_portal_tab_helper.h

@@ -10,8 +10,6 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/resource_type.h"
@@ -54,7 +52,6 @@ class CaptivePortalTabReloader;
 // https://docs.google.com/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit
 class CaptivePortalTabHelper
     : public content::WebContentsObserver,
-      public content::NotificationObserver,
       public content::WebContentsUserData<CaptivePortalTabHelper> {
  public:
   ~CaptivePortalTabHelper() override;
@@ -68,11 +65,6 @@ class CaptivePortalTabHelper
       content::NavigationHandle* navigation_handle) override;
   void DidStopLoading() override;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // Called when a certificate interstitial error page is about to be shown.
   void OnSSLCertError(const net::SSLInfo& ssl_info);
 
@@ -94,6 +86,8 @@ class CaptivePortalTabHelper
   friend class content::WebContentsUserData<CaptivePortalTabHelper>;
   explicit CaptivePortalTabHelper(content::WebContents* web_contents);
 
+  void Observe(const CaptivePortalService::Results& results);
+
   // Called by Observe in response to the corresponding event.
   void OnCaptivePortalResults(
       captive_portal::CaptivePortalResult previous_result,
@@ -123,7 +117,7 @@ class CaptivePortalTabHelper
   // portal resolution.
   bool is_captive_portal_window_;
 
-  content::NotificationRegistrar registrar_;
+  std::unique_ptr<CaptivePortalService::Subscription> subscription_;
 
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

@@ -12,10 +12,6 @@
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -152,12 +148,10 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {
     CaptivePortalService::Results results;
     results.previous_result = previous_result;
     results.result = result;
-    content::Details<CaptivePortalService::Results> details_results(&results);
 
     EXPECT_CALL(mock_reloader(), OnCaptivePortalResults(previous_result,
                                                         result)).Times(1);
-    tab_helper()->Observe(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-                          source_profile, details_results);
+    tab_helper()->Observe(results);
   }
 
   MockCaptivePortalTabReloader& mock_reloader() { return *mock_reloader_; }

chrome/browser/chrome_notification_types.h

@@ -197,15 +197,6 @@ enum NotificationType {
   NOTIFICATION_TAB_DRAG_LOOP_DONE,
 #endif
 
-  // DEPRECATED: Instead of listening this notification, use
-  // CaptivePortalService::RegisterCallback().
-  // TODO(blundell): Delete this notification as part of
-  // https://crbug.com/1030692.
-  // Sent when the CaptivePortalService checks if we're behind a captive portal.
-  // The Source is the Profile the CaptivePortalService belongs to, and the
-  // Details are a Details<CaptivePortalService::CheckResults>.
-  NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-
   // Sent when the applications in the NTP app launcher have been reordered.
   // The details, if not NoDetails, is the std::string ID of the extension that
   // was moved.

chrome/browser/ssl/captive_portal_metrics_recorder.cc

@@ -8,11 +8,8 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
@@ -50,8 +47,10 @@ CaptivePortalMetricsRecorder::CaptivePortalMetricsRecorder(
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   captive_portal_detection_enabled_ =
       CaptivePortalServiceFactory::GetForProfile(profile)->enabled();
-  registrar_.Add(this, chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-                 content::Source<content::BrowserContext>(profile));
+  subscription_ =
+      CaptivePortalServiceFactory::GetForProfile(profile)->RegisterCallback(
+          base::Bind(&CaptivePortalMetricsRecorder::Observe,
+                     base::Unretained(this)));
 }
 
 CaptivePortalMetricsRecorder::~CaptivePortalMetricsRecorder() = default;
@@ -78,19 +77,13 @@ void CaptivePortalMetricsRecorder::RecordCaptivePortalUMAStatistics() const {
 }
 
 void CaptivePortalMetricsRecorder::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, type);
-
+    const CaptivePortalService::Results& results) {
   // When detection is disabled, captive portal service always sends
   // RESULT_INTERNET_CONNECTED. Ignore any probe results in that case.
   if (!captive_portal_detection_enabled_)
     return;
 
   captive_portal_probe_completed_ = true;
-  CaptivePortalService::Results* results =
-      content::Details<CaptivePortalService::Results>(details).ptr();
   // If a captive portal was detected at any point when the interstitial was
   // displayed, assume that the interstitial was caused by a captive portal.
   // Example scenario:
@@ -102,9 +95,9 @@ void CaptivePortalMetricsRecorder::Observe(
   // potentially caused by the captive portal.
   captive_portal_detected_ =
       captive_portal_detected_ ||
-      (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
+      (results.result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
   // Also keep track of non-HTTP portals and error cases.
   captive_portal_no_response_ =
       captive_portal_no_response_ ||
-      (results->result == captive_portal::RESULT_NO_RESPONSE);
+      (results.result == captive_portal::RESULT_NO_RESPONSE);
 }

chrome/browser/ssl/captive_portal_metrics_recorder.h

@@ -9,8 +9,7 @@
 #include <vector>
 
 #include "base/time/time.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "net/cert/x509_certificate.h"
 #include "url/gurl.h"
 
@@ -22,11 +21,11 @@ class WebContents;
 // metrics. It 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 CaptivePortalMetricsRecorder : public content::NotificationObserver {
+class CaptivePortalMetricsRecorder {
  public:
   CaptivePortalMetricsRecorder(content::WebContents* web_contents,
                                bool overridable);
-  ~CaptivePortalMetricsRecorder() override;
+  ~CaptivePortalMetricsRecorder();
 
   // Should be called when the interstitial is closing.
   void RecordCaptivePortalUMAStatistics() const;
@@ -34,10 +33,7 @@ class CaptivePortalMetricsRecorder : public content::NotificationObserver {
  private:
   typedef std::vector<std::string> Tokens;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  void Observe(const CaptivePortalService::Results& results);
 
   bool overridable_;
   bool captive_portal_detection_enabled_;
@@ -47,7 +43,7 @@ class CaptivePortalMetricsRecorder : public content::NotificationObserver {
   bool captive_portal_no_response_;
   bool captive_portal_detected_;
 
-  content::NotificationRegistrar registrar_;
+  std::unique_ptr<CaptivePortalService::Subscription> subscription_;
 };
 
 #endif  // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_METRICS_RECORDER_H_

chrome/browser/ssl/ssl_error_handler.cc

@@ -21,7 +21,7 @@
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/captive_portal_helper.h"
 #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h"
@@ -53,8 +53,6 @@
 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
 
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-#include "chrome/browser/captive_portal/captive_portal_service.h"
-#include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #endif
 
@@ -573,8 +571,7 @@ void SSLErrorHandler::HandleSSLError(
               request_url, std::move(ssl_cert_reporter),
               g_config.Pointer()->on_blocking_page_shown_callback(),
               std::move(blocking_page_ready_callback))),
-      web_contents, profile, cert_error, ssl_info, network_time_tracker,
-      request_url);
+      web_contents, cert_error, ssl_info, network_time_tracker, request_url);
   web_contents->SetUserData(UserDataKey(), base::WrapUnique(error_handler));
   error_handler->StartHandlingError();
 }
@@ -644,7 +641,6 @@ void SSLErrorHandler::SetClientCallbackOnInterstitialsShown(
 SSLErrorHandler::SSLErrorHandler(
     std::unique_ptr<Delegate> delegate,
     content::WebContents* web_contents,
-    Profile* profile,
     int cert_error,
     const net::SSLInfo& ssl_info,
     network_time::NetworkTimeTracker* network_time_tracker,
@@ -652,7 +648,6 @@ SSLErrorHandler::SSLErrorHandler(
     : content::WebContentsObserver(web_contents),
       delegate_(std::move(delegate)),
       web_contents_(web_contents),
-      profile_(profile),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
       request_url_(request_url),
@@ -764,13 +759,13 @@ void SSLErrorHandler::StartHandlingError() {
     }
   }
 
-  // Always listen to captive portal notifications, otherwise build fails
-  // because profile_ isn't used. This is a no-op on platforms where
-  // captive portal detection is disabled.
-  registrar_.Add(this, chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-                 content::Source<content::BrowserContext>(profile_));
-
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+  subscription_ =
+      CaptivePortalServiceFactory::GetForProfile(profile)->RegisterCallback(
+          base::Bind(&SSLErrorHandler::Observe, base::Unretained(this)));
+
   CaptivePortalTabHelper* captive_portal_tab_helper =
       CaptivePortalTabHelper::FromWebContents(web_contents_);
   if (captive_portal_tab_helper) {
@@ -880,18 +875,11 @@ void SSLErrorHandler::CommonNameMismatchHandlerCallback(
   }
 }
 
-void SSLErrorHandler::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void SSLErrorHandler::Observe(const CaptivePortalService::Results& results) {
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-  DCHECK_EQ(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, type);
-
   timer_.Stop();
-  CaptivePortalService::Results* results =
-      content::Details<CaptivePortalService::Results>(details).ptr();
-  if (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL)
-    ShowCaptivePortalInterstitial(results->landing_url);
+  if (results.result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL)
+    ShowCaptivePortalInterstitial(results.landing_url);
   else
     ShowSSLInterstitial();
 #else

chrome/browser/ssl/ssl_error_handler.h

@@ -12,14 +12,13 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "components/security_interstitials/content/common_name_mismatch_handler.h"
 #include "components/security_interstitials/content/security_interstitial_page.h"
 #include "components/security_interstitials/content/ssl_cert_reporter.h"
 #include "components/security_interstitials/content/ssl_error_assistant.pb.h"
 #include "components/ssl_errors/error_classification.h"
 #include "content/public/browser/certificate_request_result_type.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/restore_type.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -27,7 +26,6 @@
 #include "url/gurl.h"
 
 class CommonNameMismatchHandler;
-class Profile;
 struct DynamicInterstitialInfo;
 
 namespace base {
@@ -67,8 +65,7 @@ extern const base::Feature kCaptivePortalCertificateList;
 // uses captive_portal::CaptivePortalService which can only be accessed on the
 // UI thread.
 class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
-                        public content::WebContentsObserver,
-                        public content::NotificationObserver {
+                        public content::WebContentsObserver {
  public:
   typedef base::Callback<void(content::WebContents*)> TimerStartedCallback;
   typedef base::OnceCallback<void(
@@ -184,7 +181,6 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
  protected:
   SSLErrorHandler(std::unique_ptr<Delegate> delegate,
                   content::WebContents* web_contents,
-                  Profile* profile,
                   int cert_error,
                   const net::SSLInfo& ssl_info,
                   network_time::NetworkTimeTracker* network_time_tracker,
@@ -198,6 +194,10 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
  private:
   friend class content::WebContentsUserData<SSLErrorHandler>;
   FRIEND_TEST_ALL_PREFIXES(SSLErrorHandlerTest, CalculateOptionsMask);
+  FRIEND_TEST_ALL_PREFIXES(SSLErrorHandlerNameMismatchTest,
+                           ShouldShowCustomInterstitialOnCaptivePortalResult);
+  FRIEND_TEST_ALL_PREFIXES(SSLErrorHandlerNameMismatchTest,
+                           ShouldShowSSLInterstitialOnNoCaptivePortalResult);
 
   void ShowCaptivePortalInterstitial(const GURL& landing_url);
   void ShowMITMSoftwareInterstitial(const std::string& mitm_software_name);
@@ -213,11 +213,8 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
       CommonNameMismatchHandler::SuggestedUrlCheckResult result,
       const GURL& suggested_url);
 
-  // content::NotificationObserver:
-  void Observe(
-      int type,
-      const content::NotificationSource& source,
-      const content::NotificationDetails& details) override;
+  // Callback invoked with the result of a query for captive portal status.
+  void Observe(const CaptivePortalService::Results& results);
 
   // content::WebContentsObserver:
   void DidStartNavigation(
@@ -237,13 +234,13 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
 
   std::unique_ptr<Delegate> delegate_;
   content::WebContents* const web_contents_;
-  Profile* const profile_;
   const int cert_error_;
   const net::SSLInfo ssl_info_;
   const GURL request_url_;
   network_time::NetworkTimeTracker* network_time_tracker_;
 
-  content::NotificationRegistrar registrar_;
+  std::unique_ptr<CaptivePortalService::Subscription> subscription_;
+
   base::OneShotTimer timer_;
 
   std::unique_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_;

chrome/browser/ssl/ssl_error_handler_unittest.cc

@@ -19,7 +19,6 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_assistant.h"
 #include "chrome/browser/ssl/ssl_error_handler.h"
@@ -36,7 +35,6 @@
 #include "components/security_interstitials/core/ssl_error_ui.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_service.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
@@ -135,14 +133,12 @@ class TestSSLErrorHandler : public SSLErrorHandler {
  public:
   TestSSLErrorHandler(std::unique_ptr<Delegate> delegate,
                       content::WebContents* web_contents,
-                      Profile* profile,
                       int cert_error,
                       const net::SSLInfo& ssl_info,
                       network_time::NetworkTimeTracker* network_time_tracker,
                       const GURL& request_url)
       : SSLErrorHandler(std::move(delegate),
                         web_contents,
-                        profile,
                         cert_error,
                         ssl_info,
                         network_time_tracker,
@@ -153,11 +149,9 @@ class TestSSLErrorHandler : public SSLErrorHandler {
 
 class TestSSLErrorHandlerDelegate : public SSLErrorHandler::Delegate {
  public:
-  TestSSLErrorHandlerDelegate(Profile* profile,
-                              content::WebContents* web_contents,
+  TestSSLErrorHandlerDelegate(content::WebContents* web_contents,
                               const net::SSLInfo& ssl_info)
-      : profile_(profile),
-        captive_portal_checked_(false),
+      : captive_portal_checked_(false),
         os_reports_captive_portal_(false),
         suggested_url_exists_(false),
         suggested_url_checked_(false),
@@ -170,17 +164,6 @@ class TestSSLErrorHandlerDelegate : public SSLErrorHandler::Delegate {
         is_overridable_error_(true),
         has_blocked_interception_(false) {}
 
-  void SendCaptivePortalNotification(
-      captive_portal::CaptivePortalResult result) {
-    CaptivePortalService::Results results;
-    results.previous_result = captive_portal::RESULT_INTERNET_CONNECTED;
-    results.result = result;
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
-        content::Source<content::BrowserContext>(profile_),
-        content::Details<CaptivePortalService::Results>(&results));
-  }
-
   void SendSuggestedUrlCheckResult(
       const CommonNameMismatchHandler::SuggestedUrlCheckResult& result,
       const GURL& suggested_url) {
@@ -283,7 +266,6 @@ class TestSSLErrorHandlerDelegate : public SSLErrorHandler::Delegate {
     return has_blocked_interception_;
   }
 
-  Profile* profile_;
   bool captive_portal_checked_;
   bool os_reports_captive_portal_;
   bool suggested_url_exists_;
@@ -319,12 +301,11 @@ class SSLErrorHandlerNameMismatchTest : public ChromeRenderViewHostTestHarness {
     ssl_info_.public_key_hashes.push_back(
         net::HashValue(kCertPublicKeyHashValue));
 
-    delegate_ =
-        new TestSSLErrorHandlerDelegate(profile(), web_contents(), ssl_info_);
+    delegate_ = new TestSSLErrorHandlerDelegate(web_contents(), ssl_info_);
     error_handler_.reset(new TestSSLErrorHandler(
         std::unique_ptr<SSLErrorHandler::Delegate>(delegate_), web_contents(),
-        profile(), net::MapCertStatusToNetError(ssl_info_.cert_status),
-        ssl_info_, /*network_time_tracker=*/nullptr, GURL() /*request_url*/));
+        net::MapCertStatusToNetError(ssl_info_.cert_status), ssl_info_,
+        /*network_time_tracker=*/nullptr, GURL() /*request_url*/));
   }
 
   void TearDown() override {
@@ -581,12 +562,11 @@ class SSLErrorAssistantProtoTest : public ChromeRenderViewHostTestHarness {
     ssl_info_.public_key_hashes.push_back(
         net::HashValue(kCertPublicKeyHashValue));
 
-    delegate_ =
-        new TestSSLErrorHandlerDelegate(profile(), web_contents(), ssl_info_);
+    delegate_ = new TestSSLErrorHandlerDelegate(web_contents(), ssl_info_);
     error_handler_.reset(new TestSSLErrorHandler(
         std::unique_ptr<SSLErrorHandler::Delegate>(delegate_), web_contents(),
-        profile(), net::MapCertStatusToNetError(ssl_info_.cert_status),
-        ssl_info_, /*network_time_tracker=*/nullptr, GURL() /*request_url*/));
+        net::MapCertStatusToNetError(ssl_info_.cert_status), ssl_info_,
+        /*network_time_tracker=*/nullptr, GURL() /*request_url*/));
   }
 
   net::SSLInfo ssl_info_;
@@ -642,12 +622,11 @@ class SSLErrorHandlerDateInvalidTest : public ChromeRenderViewHostTestHarness {
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
     ssl_info_.cert_status = net::CERT_STATUS_DATE_INVALID;
 
-    delegate_ =
-        new TestSSLErrorHandlerDelegate(profile(), web_contents(), ssl_info_);
+    delegate_ = new TestSSLErrorHandlerDelegate(web_contents(), ssl_info_);
     error_handler_.reset(new TestSSLErrorHandler(
         std::unique_ptr<SSLErrorHandler::Delegate>(delegate_), web_contents(),
-        profile(), net::MapCertStatusToNetError(ssl_info_.cert_status),
-        ssl_info_, tracker_.get(), GURL() /*request_url*/));
+        net::MapCertStatusToNetError(ssl_info_.cert_status), ssl_info_,
+        tracker_.get(), GURL() /*request_url*/));
 
     // Fix flakiness in case system time is off and triggers a bad clock
     // interstitial. https://crbug.com/666821#c50
@@ -753,8 +732,12 @@ TEST_F(SSLErrorHandlerNameMismatchTest,
   EXPECT_FALSE(delegate()->captive_portal_interstitial_shown());
   // Fake a captive portal result.
   delegate()->ClearSeenOperations();
-  delegate()->SendCaptivePortalNotification(
-      captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
+
+  CaptivePortalService::Results results;
+  results.previous_result = captive_portal::RESULT_INTERNET_CONNECTED;
+  results.result = captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL;
+
+  error_handler()->Observe(results);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(error_handler()->IsTimerRunningForTesting());
@@ -784,8 +767,12 @@ TEST_F(SSLErrorHandlerNameMismatchTest,
   // This should immediately trigger an SSL interstitial without waiting for
   // the timer to expire.
   delegate()->ClearSeenOperations();
-  delegate()->SendCaptivePortalNotification(
-      captive_portal::RESULT_INTERNET_CONNECTED);
+
+  CaptivePortalService::Results results;
+  results.previous_result = captive_portal::RESULT_INTERNET_CONNECTED;
+  results.result = captive_portal::RESULT_INTERNET_CONNECTED;
+
+  error_handler()->Observe(results);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(error_handler()->IsTimerRunningForTesting());
@@ -1507,11 +1494,11 @@ TEST_F(SSLErrorHandlerTest, BlockedInterceptionInterstitial) {
   ssl_info.public_key_hashes.push_back(net::HashValue(kCertPublicKeyHashValue));
 
   std::unique_ptr<TestSSLErrorHandlerDelegate> delegate(
-      new TestSSLErrorHandlerDelegate(profile(), web_contents(), ssl_info));
+      new TestSSLErrorHandlerDelegate(web_contents(), ssl_info));
 
   TestSSLErrorHandlerDelegate* delegate_ptr = delegate.get();
   TestSSLErrorHandler error_handler(
-      std::move(delegate), web_contents(), profile(),
+      std::move(delegate), web_contents(),
       net::MapCertStatusToNetError(ssl_info.cert_status), ssl_info,
       /*network_time_tracker=*/nullptr, GURL() /*request_url*/);