Next phase for chrome.networkingPrivate interface.

chromeos/dbus/shill_service_client.cc

 // Copyright (c) 2012 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.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 218 matching lines @@
                            const std::string& name,
                            const base::Value& value,
                            const base::Closure& callback,
                            const ErrorCallback& error_callback) OVERRIDE {
     base::DictionaryValue* dict = NULL;
     if (!stub_services_.GetDictionaryWithoutPathExpansion(
             service_path.value(), &dict)) {
       error_callback.Run("StubError", "Service not found");
       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.
+      std::string state;
+      if (value.GetAsString(&state) && state == flimflam::kStateOnline) {
+        ShillManagerClient* manager_client =
+            DBusThreadManager::Get()->GetShillManagerClient();
+        manager_client->GetTestInterface()->RemoveService(service_path.value());
+        manager_client->GetTestInterface()->AddServiceAtIndex(
+            service_path.value(), 0, true);

[stevenjb, 2013/02/12 17:19:16]

I'd like to avoid cross dependencies between these client stubs, or at least
talk through how we want these stubs to evolve before adding more complex
behaviors like this.

[Greg Spencer (Chromium), 2013/02/12 17:34:56]

OK, but the reason for this is that I'm unable to test the network list change
event without connect or disconnect affecting it, since those are the only
methods I have so far to change state (and when we run with Shill, connecting
does change the order).

+      }
+    }
     dict->SetWithoutPathExpansion(name, value.DeepCopy());
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ShillServiceClientStubImpl::NotifyObserversPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(), service_path, name));
     if (callback.is_null())
       return;
     MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
 
@@ skipping 278 matching lines @@
 ShillServiceClient* ShillServiceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillServiceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillServiceClientStubImpl();
 }
 
 }  // namespace chromeos