Implement networkingPrivate.getNetworks

chromeos/dbus/fake_shill_manager_client.cc

Index: chromeos/dbus/fake_shill_manager_client.cc
diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc
index 117f85013be85739a469398546f6bad78024f8da..86c0061271427fe9285fa857e25f47a7f5d9d00c 100644
--- a/chromeos/dbus/fake_shill_manager_client.cc
+++ b/chromeos/dbus/fake_shill_manager_client.cc
@@ -488,6 +488,11 @@ void FakeShillManagerClient::ServiceStateChanged(
 }
 
 void FakeShillManagerClient::SortManagerServices() {
+  SortServiceList(shill::kServicesProperty);
+  SortServiceList(shill::kServiceCompleteListProperty);
+}
+
+void FakeShillManagerClient::SortServiceList(const std::string& property) {
   static const char* ordered_types[] = {
     shill::kTypeEthernet,
     shill::kTypeWifi,
@@ -495,28 +500,26 @@ void FakeShillManagerClient::SortManagerServices() {
     shill::kTypeWimax,
     shill::kTypeVPN
   };
-  base::ListValue* service_list = GetListProperty(shill::kServicesProperty);
-  if (!service_list || service_list->empty()) {
-    if (!default_service_.empty()) {
-      default_service_.clear();
-      base::StringValue empty_value("");
-      SetManagerProperty(shill::kDefaultServiceProperty, empty_value);
-    }
-    return;
-  }
+
+  base::ListValue* service_list = GetListProperty(property);
   std::vector<std::string> active_services;
   std::vector<std::string> inactive_services;
-  for (size_t i = 0; i < arraysize(ordered_types); ++i) {
-    AppendServicesForType(service_list, ordered_types[i],
+  if (service_list && !service_list->empty()) {
+    for (size_t i = 0; i < arraysize(ordered_types); ++i) {
+      AppendServicesForType(service_list, ordered_types[i],
                           &active_services, &inactive_services);

[pneubeck (no reviews), 2014/05/15 18:28:37]

nit: format

[stevenjb, 2014/05/15 20:12:41]

Done.

[pneubeck (no reviews), 2014/05/16 13:18:55]

not done? (I meant the indentation of the second argument line)

+    }
+    service_list->Clear();
+    for (size_t i = 0; i < active_services.size(); ++i)
+      service_list->AppendString(active_services[i]);
+    for (size_t i = 0; i < inactive_services.size(); ++i)
+      service_list->AppendString(inactive_services[i]);
+
+    CallNotifyObserversPropertyChanged(property);
   }
-  service_list->Clear();
-  for (size_t i = 0; i < active_services.size(); ++i)
-    service_list->AppendString(active_services[i]);
-  for (size_t i = 0; i < inactive_services.size(); ++i)
-    service_list->AppendString(inactive_services[i]);
 
-  CallNotifyObserversPropertyChanged(shill::kServicesProperty);
+  if (property != shill::kServicesProperty)
+    return;
 
   // Set the first active service as the Default service.
   std::string new_default_service;
@@ -540,6 +543,8 @@ void FakeShillManagerClient::SortManagerServices() {
     base::StringValue default_service_value(default_service_);
     SetManagerProperty(shill::kDefaultServiceProperty, default_service_value);
   }
+
+  return;

[pneubeck (no reviews), 2014/05/15 18:28:37]

nit: remove

[stevenjb, 2014/05/15 20:12:41]

Done.

[pneubeck (no reviews), 2014/05/16 13:18:55]

Not done?

 }