Added method getCaptivePortalStatus to networkingPrivate extension.

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

 // Copyright 2013 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 "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/net/network_portal_detector.h"
+#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "components/onc/onc_constants.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
@@ skipping 11 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
 using testing::Return;
 using testing::_;
 
 #if defined(OS_CHROMEOS)
 using chromeos::CryptohomeClient;
 using chromeos::DBUS_METHOD_CALL_SUCCESS;
 using chromeos::DBusMethodCallStatus;
 using chromeos::DBusThreadManager;
+using chromeos::NetworkPortalDetector;
+using chromeos::NetworkPortalDetectorTestImpl;
 using chromeos::ShillDeviceClient;
 using chromeos::ShillManagerClient;
 using chromeos::ShillProfileClient;
 using chromeos::ShillServiceClient;
 #else  // !defined(OS_CHROMEOS)
 using extensions::NetworkingPrivateServiceClientFactory;
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
 
@@ skipping 388 matching lines @@
                        SetWifiTDLSEnabledState) {
   EXPECT_TRUE(RunNetworkingSubtest("setWifiTDLSEnabledState")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
                        GetWifiTDLSStatus) {
   EXPECT_TRUE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_;
 }
 #endif
 
+#if defined(OS_CHROMEOS)
+// NetworkPortalDetector is only enabled for Chrome OS.

[Yoyo Zhou, 2014/03/31 20:38:45]

nit: comment should come before the #if def

[ygorshenin1, 2014/04/01 07:07:55]

Done.

+IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
+                       GetCaptivePortalStatus) {
+  NetworkPortalDetectorTestImpl* detector = new NetworkPortalDetectorTestImpl();
+  NetworkPortalDetector::InitializeForTesting(detector);
+  NetworkPortalDetector::CaptivePortalState state;
+  state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+  detector->SetDetectionResultsForTesting("stub_ethernet", state);
+
+  state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE;
+  detector->SetDetectionResultsForTesting("stub_wifi1", state);
+
+  state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  detector->SetDetectionResultsForTesting("stub_wifi2", state);
+
+  state.status =
+      NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
+  detector->SetDetectionResultsForTesting("stub_cellular1", state);
+
+  EXPECT_TRUE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_;
+}
+#endif
+
 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
                         ExtensionNetworkingPrivateApiTest,
                         testing::Bool());
 
 }  // namespace