Added stub portalled wifi network.

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 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 "chrome/browser/chromeos/net/network_portal_detector_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #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"
 #include "grit/generated_resources.h"
 #include "net/http/http_status_code.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using captive_portal::CaptivePortalDetector;
 
@@ skipping 321 matching lines @@
   if (IsPortalCheckPending())
     detection_task_.Cancel();
   else if (IsCheckingForPortal())
     captive_portal_detector_->Cancel();
   detection_timeout_.Cancel();
   state_ = STATE_IDLE;
 }
 
 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());
 
   VLOG(1) << "Portal detection completed: "
           << "network=" << default_network_id_ << ", "
           << "result=" << CaptivePortalDetector::CaptivePortalResultToString(
               results.result) << ", "
           << "response_code=" << results.response_code;
 
   state_ = STATE_IDLE;
   detection_timeout_.Cancel();
 
   const NetworkState* default_network =
       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) {
           state.status = CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
         } else if (default_network && (default_network->connection_state() ==
                                        flimflam::kStatePortal)) {
           // Take into account shill's detection results.
           state.status = CAPTIVE_PORTAL_STATUS_PORTAL;
           LOG(WARNING) << "Network " << default_network->guid() << " "
                        << "is marked as "
@@ skipping 103 matching lines @@
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network)
     return kBaseRequestTimeoutSec;
   if (lazy_detection_enabled_)
     return kLazyRequestTimeoutSec;
   return attempt_count_ * kBaseRequestTimeoutSec;
 }
 
 }  // namespace chromeos