NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chromeos/dbus/shill_service_client_stub.cc

Index: chromeos/dbus/shill_service_client_stub.cc
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc
index 677f9d651a61168b341a871851e88a24457948d3..c1b0d4062feb78ea1ed0354e4bee1e7a4fdd0299 100644
--- a/chromeos/dbus/shill_service_client_stub.cc
+++ b/chromeos/dbus/shill_service_client_stub.cc
@@ -106,10 +106,13 @@ void ShillServiceClientStub::SetProperty(const dbus::ObjectPath& service_path,
     return;
   }
   if (name == flimflam::kStateProperty) {
-    // If we connect to a service, then we move it to the top of the list in
-    // the manager client.
+    // If the service went into a connected state, then move it to the top of
+    // the list in the manager client.
+    // TODO(gauravsh): Generalize to sort services properly to allow for testing
+    //  more complex scenarios.
     std::string state;
-    if (value.GetAsString(&state) && state == flimflam::kStateOnline) {
+    if (value.GetAsString(&state) && (state == flimflam::kStateOnline ||
+                                      state == flimflam::kStatePortal))  {
       ShillManagerClient* manager_client =
           DBusThreadManager::Get()->GetShillManagerClient();
       manager_client->GetTestInterface()->RemoveService(service_path.value());