Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_service_client.cc

 // Copyright 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/fake_shill_service_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 21 matching lines @@
 
 void PassStubServiceProperties(
     const ShillServiceClient::DictionaryValueCallback& callback,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue* properties) {
   callback.Run(call_status, *properties);
 }
 
 void CallSortManagerServices() {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      SortManagerServices();
+      SortManagerServices(true);
 }
 
 int GetInteractiveDelay() {
   return DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       GetInteractiveDelay();
 }
 
 }  // namespace
 
 FakeShillServiceClient::FakeShillServiceClient() : weak_ptr_factory_(this) {
@@ skipping 262 matching lines @@
 }
 
 void FakeShillServiceClient::AddServiceWithIPConfig(
     const std::string& service_path,
     const std::string& guid,
     const std::string& name,
     const std::string& type,
     const std::string& state,
     const std::string& ipconfig_path,
     bool add_to_visible_list) {
-  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      AddManagerService(service_path, add_to_visible_list);
   std::string device_path =
       DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()->
       GetDevicePathForType(type);
 
   base::DictionaryValue* properties =
       GetModifiableServiceProperties(service_path, true);
   connect_behavior_.erase(service_path);
 
   std::string profile_path;
   base::DictionaryValue profile_properties;
@@ skipping 22 matching lines @@
       new base::StringValue(name));
   properties->SetWithoutPathExpansion(
       shill::kDeviceProperty,
       new base::StringValue(device_path));
   properties->SetWithoutPathExpansion(
       shill::kTypeProperty,
       new base::StringValue(type));
   properties->SetWithoutPathExpansion(
       shill::kStateProperty,
       new base::StringValue(state));
+  properties->SetWithoutPathExpansion(
+      shill::kVisibleProperty,
+      new base::FundamentalValue(add_to_visible_list));
   if (!ipconfig_path.empty()) {
     properties->SetWithoutPathExpansion(
         shill::kIPConfigProperty,
         new base::StringValue(ipconfig_path));
   }
   if (type == shill::kTypeWifi) {
     properties->SetWithoutPathExpansion(
         shill::kSecurityProperty,
         new base::StringValue(shill::kSecurityNone));
   }
 
-  CallSortManagerServices();
-
   if (!profile_path.empty()) {
     DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface()->
         UpdateService(profile_path, service_path);
   }
+
+  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+      AddManagerService(service_path);
 }
 
 void FakeShillServiceClient::RemoveService(const std::string& service_path) {
-  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      RemoveManagerService(service_path, true);
-
   stub_services_.RemoveWithoutPathExpansion(service_path, NULL);
   connect_behavior_.erase(service_path);
+  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+      RemoveManagerService(service_path);
 }
 
 bool FakeShillServiceClient::SetServiceProperty(const std::string& service_path,
                                                 const std::string& property,
                                                 const base::Value& value) {
   base::DictionaryValue* dict = NULL;
   if (!stub_services_.GetDictionaryWithoutPathExpansion(service_path, &dict))
     return false;
 
   VLOG(1) << "Service.SetProperty: " << property << " = " << value
@@ skipping 37 matching lines @@
   }
 
   // Notify the Manager if the state changed (affects DefaultService).
   if (property == shill::kStateProperty) {
     std::string state;
     value.GetAsString(&state);
     DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
         ServiceStateChanged(service_path, state);
   }
 
-  // If the State changes, the sort order of Services may change and the
-  // DefaultService property may change.
-  if (property == shill::kStateProperty) {
+  // If the State or Visibility changes, the sort order of Services may change
+  // and the DefaultService property may change.
+  if (property == shill::kStateProperty ||
+      property == shill::kVisibleProperty) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&CallSortManagerServices));
   }
 
   // Notifiy Chrome of the property change.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&FakeShillServiceClient::NotifyObserversPropertyChanged,
                  weak_ptr_factory_.GetWeakPtr(),
                  dbus::ObjectPath(service_path), changed_property));
@@ skipping 143 matching lines @@
             base::StringValue(shill::kErrorBadPassphrase)));
   } else {
     // Set Online.
     SetServiceProperty(service_path,
                        shill::kStateProperty,
                        base::StringValue(shill::kStateOnline));
   }
 }
 
 }  // namespace chromeos