Replace misc. network stub flags with more flexible ones

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 568e212d0caa1b2bc62be1a66bf9df984c2aaa96..0a8b89b8eefa3c7faa05e46118a1f81687a81262 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc
@@ -10,7 +10,6 @@
 #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"
@@ -362,11 +361,6 @@ void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
   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());