Replace misc. network stub flags with more flexible ones

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 "chromeos/dbus/shill_stub_helper.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 331 matching lines @@
     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 (shill_stub_helper::IsStubPortalledWifiEnabled(default_service_path_)) {

[pneubeck (no reviews), 2014/02/28 09:37:59]

are you sure?
I thought this was for triggering the Captive portal detection by providing the
right command line flag. Does this still work or does ygorshenin@ not need it
anymore?

[stevenjb, 2014/02/28 17:43:06]

If we need it again we should implement it better in the fake implementations
themselves. It didn't break any tests, and as you pointed out was a terrible
hack in production code. I will include ygorshenin@ on the CL.

-    result = captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL;
-    response_code = 200;
-  }
-
   DCHECK(CalledOnValidThread());
   DCHECK(IsCheckingForPortal());
 
   VLOG(1) << "Portal detection completed: "
           << "name=" << default_network_name_ << ", "
           << "id=" << default_network_id_ << ", "
           << "result="
           << CaptivePortalDetector::CaptivePortalResultToString(results.result)
           << ", "
           << "response_code=" << results.response_code;
@@ skipping 170 matching lines @@
       if (network->connection_state() != shill::kStateOnline)
         RecordDiscrepancyWithShill(network, status);
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos