NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chromeos/dbus/shill_service_client_stub.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 "chromeos/dbus/shill_service_client_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 88 matching lines @@
                                          const base::Value& value,
                                          const base::Closure& callback,
                                          const ErrorCallback& error_callback) {
   base::DictionaryValue* dict = NULL;
   if (!stub_services_.GetDictionaryWithoutPathExpansion(
           service_path.value(), &dict)) {
     error_callback.Run("Error.InvalidService", "Invalid Service");
     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()->MoveServiceToIndex(
           service_path.value(), 0, true);
     }
   }
   dict->SetWithoutPathExpansion(name, value.DeepCopy());
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::NotifyObserversPropertyChanged,
@@ skipping 320 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos