Refactor NetworkPortalDetector and NetworkPortalNotificationController.

chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc

 // 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.
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
+#include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "components/captive_portal/captive_portal_testing_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/test/result_catcher.h"
 #include "net/base/net_errors.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 77 matching lines @@
                                      base::StringValue("01:02:ab:7f:90:00"));
     service_test->SetServiceProperty(kWifi1ServicePath,
                                      shill::kSignalStrengthProperty,
                                      base::FundamentalValue(40));
     profile_test->AddService(ShillProfileClient::GetSharedProfilePath(),
                              kWifi1ServicePath);
 
     content::RunAllPendingInMessageLoop();
 
     network_portal_detector_ = new NetworkPortalDetectorImpl(
-        g_browser_process->system_request_context());
+        g_browser_process->system_request_context(), true);
     NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
     network_portal_detector_->Enable(false /* start_detection */);
     set_detector(network_portal_detector_->captive_portal_detector_.get());
   }
 
   void LoadTestExtension() {
     extension_ = LoadExtension(test_data_dir_.AppendASCII("networking_config"));
   }
 
   bool RunExtensionTest(const std::string& path) {
     return RunExtensionSubtest("networking_config",
                                extension_->GetResourceURL(path).spec());
   }
 
   void SimulateCaptivePortal() {
     network_portal_detector_->StartDetection();
     content::RunAllPendingInMessageLoop();
 
     // Simulate a captive portal reply.
     CompleteURLFetch(net::OK, 200, nullptr);
   }
 
   void SimulateSuccessfulCaptivePortalAuth() {
     content::RunAllPendingInMessageLoop();
     CompleteURLFetch(net::OK, 204, nullptr);
   }
 
+  NetworkPortalDetector::CaptivePortalStatus GetCaptivePortalStatus(
+      const std::string& guid) {
+    return network_portal_detector_->GetCaptivePortalState(kWifi1ServiceGUID)
+        .status;
+  }
+
   NetworkPortalDetectorImpl* network_portal_detector_ = nullptr;
 
  private:
   const extensions::Extension* extension_ = nullptr;
 };
 
 IN_PROC_BROWSER_TEST_F(NetworkingConfigTest, ApiAvailability) {
   ASSERT_TRUE(RunExtensionSubtest("networking_config", "api_availability.html"))
       << message_;
 }
@@ skipping 25 matching lines @@
   MessageCenter::Get()->ClickOnNotificationButton(
       NetworkPortalNotificationController::kNotificationId,
       NetworkPortalNotificationController::kUseExtensionButtonIndex);
 
   extensions::ResultCatcher catcher;
   EXPECT_TRUE(catcher.GetNextResult());
 
   // Simulate the captive portal vanishing.
   SimulateSuccessfulCaptivePortalAuth();
 
-  NetworkPortalDetector::CaptivePortalState state =
-      network_portal_detector_->GetCaptivePortalState(kWifi1ServiceGUID);
-  ASSERT_EQ(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, state.status);
+  ASSERT_EQ(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE,
+            GetCaptivePortalStatus(kWifi1ServiceGUID));
 }