Added stub portalled wifi network.

chrome/browser/chromeos/net/network_portal_detector_impl.cc

Index: chrome/browser/chromeos/net/network_portal_detector_impl.cc
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
index 5a1bbef56d3602e915d5078cfdb728269f82a12f..b509b1dfc40e5d87daadabce7bfd16021b416e8d 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
@@ -11,6 +11,8 @@
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"

[oshima, 2013/08/07 16:01:12]

this looks unnecessary too. can you remove it?

[ygorshenin1, 2013/08/08 08:05:57]

Done.

+#include "chromeos/chromeos_switches.h"

[oshima, 2013/08/07 16:01:12]

nit: this is no longer necessary?

[ygorshenin1, 2013/08/08 08:05:57]

Done.

+#include "chromeos/dbus/shill_service_client_stub.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/notification_service.h"
@@ -352,6 +354,15 @@ void NetworkPortalDetectorImpl::CancelPortalDetection() {
 
 void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
     const CaptivePortalDetector::Results& results) {
+  captive_portal::Result result = results.result;
+  int response_code = results.response_code;
+
+  if (ShillServiceClientStub::IsStubPortalledWifiEnabled(
+          default_service_path_)) {
+    result = captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL;
+    response_code = 200;
+  }
+
   DCHECK(CalledOnValidThread());
   DCHECK(IsCheckingForPortal());
 
@@ -368,8 +379,8 @@ void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
 
   CaptivePortalState state;
-  state.response_code = results.response_code;
-  switch (results.result) {
+  state.response_code = response_code;
+  switch (result) {
     case captive_portal::RESULT_NO_RESPONSE:
       if (attempt_count_ >= kMaxRequestAttempts) {
         if (state.response_code == net::HTTP_PROXY_AUTHENTICATION_REQUIRED) {