Add chromeos::NetworkStateManager

chromeos/dbus/shill_manager_client.cc

Index: chromeos/dbus/shill_manager_client.cc
diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc
index 08f163b9f962bdb33823934a4768f8f74642e5b7..eded94a1e865191e70212ea25b1e8a95c7879133 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -169,17 +169,53 @@ class ShillManagerClientImpl : public ShillManagerClient {
 };
 
 // A stub implementation of ShillManagerClient.
-// Implemented: Stub cellular DeviceList entry for SMS testing.
+// Implemented: Stub devices and services for NetworkStateManager tests.
+// Implemented: Stub cellular device entry for SMS tests.
 class ShillManagerClientStubImpl : public ShillManagerClient {
  public:
   ShillManagerClientStubImpl() : weak_ptr_factory_(this) {
+    // Stub Devices
     base::ListValue* device_list = new base::ListValue;
     // Note: names match Device stub map.
-    const char kStubCellular1[] = "stub_cellular1";
-    const char kStubCellular2[] = "stub_cellular2";
-    device_list->Append(base::Value::CreateStringValue(kStubCellular1));
-    device_list->Append(base::Value::CreateStringValue(kStubCellular2));
+    device_list->Append(
+        base::Value::CreateStringValue("stub_wifi_device1"));
+    device_list->Append(
+        base::Value::CreateStringValue("stub_cellular_device1"));
+    device_list->Append(
+        base::Value::CreateStringValue("stub_cellular_device2"));
     stub_properties_.Set(flimflam::kDevicesProperty, device_list);
+
+    // Stub Services
+    base::ListValue* service_list = new base::ListValue;
+    // Note: names match Service stub map.
+    service_list->Append(base::Value::CreateStringValue("stub_ethernet"));
+    service_list->Append(base::Value::CreateStringValue("stub_wifi1"));
+    service_list->Append(base::Value::CreateStringValue("stub_wifi2"));
+    service_list->Append(base::Value::CreateStringValue("stub_cellular1"));
+    base::ListValue* watched_service_list = service_list->DeepCopy();
+    stub_properties_.Set(flimflam::kServicesProperty, service_list);
+    stub_properties_.Set(flimflam::kServiceWatchListProperty,
+                         watched_service_list);
+
+    // Stub Technologies
+    base::ListValue* available_list = new base::ListValue;
+    available_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeEthernet));
+    available_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeWifi));
+    available_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeCellular));
+    stub_properties_.Set(flimflam::kAvailableTechnologiesProperty,
+                         available_list);
+
+    base::ListValue* enabled_list = new base::ListValue;
+    enabled_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeEthernet));
+    enabled_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeWifi));
+    enabled_list->Append(
+        base::Value::CreateStringValue(flimflam::kTypeCellular));
+    stub_properties_.Set(flimflam::kEnabledTechnologiesProperty, enabled_list);
   }
 
   virtual ~ShillManagerClientStubImpl() {}
@@ -187,10 +223,14 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
   //////////////////////////////////
   // ShillManagerClient overrides.
   virtual void AddPropertyChangedObserver(
-      ShillPropertyChangedObserver* observer) OVERRIDE {}
+      ShillPropertyChangedObserver* observer) OVERRIDE {
+    observer_list_.AddObserver(observer);
+  }
 
   virtual void RemovePropertyChangedObserver(
-      ShillPropertyChangedObserver* observer) OVERRIDE {}
+      ShillPropertyChangedObserver* observer) OVERRIDE {
+    observer_list_.RemoveObserver(observer);
+  }
 
   // ShillManagerClient override.
   virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
@@ -203,7 +243,7 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
 
   // ShillManagerClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock() OVERRIDE {
-    return new base::DictionaryValue;
+    return stub_properties_.DeepCopy();
   }
 
   // ShillManagerClient override.
@@ -220,6 +260,13 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
                            const base::Closure& callback,
                            const ErrorCallback& error_callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE, callback);
+    const int kScanDelaySeconds = 3;
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&ShillManagerClientStubImpl::NotifyObserversPropertyChanged,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   flimflam::kServicesProperty),
+        base::TimeDelta::FromSeconds(kScanDelaySeconds));
   }
 
   // ShillManagerClient override.
@@ -227,7 +274,21 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
       const std::string& type,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE {
+    base::ListValue* enabled_list;
+    if (!stub_properties_.GetListWithoutPathExpansion(
+            flimflam::kEnabledTechnologiesProperty, &enabled_list)) {
+      MessageLoop::current()->PostTask(
+          FROM_HERE,
+          base::Bind(error_callback, "StubError", "Property not found"));
+      return;
+    }
     MessageLoop::current()->PostTask(FROM_HERE, callback);
+    enabled_list->AppendIfNotPresent(new base::StringValue(type));
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ShillManagerClientStubImpl::NotifyObserversPropertyChanged,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   flimflam::kEnabledTechnologiesProperty));
   }
 
   // ShillManagerClient override.
@@ -235,7 +296,21 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
       const std::string& type,
       const base::Closure& callback,
       const ErrorCallback& error_callback) OVERRIDE {
+    base::ListValue* enabled_list;
+    if (!stub_properties_.GetListWithoutPathExpansion(
+            flimflam::kEnabledTechnologiesProperty, &enabled_list)) {
+      MessageLoop::current()->PostTask(
+          FROM_HERE,
+          base::Bind(error_callback, "StubError", "Property not found"));
+      return;
+    }
     MessageLoop::current()->PostTask(FROM_HERE, callback);
+    enabled_list->Remove(base::StringValue(type), NULL);
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ShillManagerClientStubImpl::NotifyObserversPropertyChanged,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   flimflam::kEnabledTechnologiesProperty));
   }
 
   // ShillManagerClient override.
@@ -251,9 +326,8 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
-    MessageLoop::current()->PostTask(FROM_HERE,
-                                     base::Bind(callback,
-                                                dbus::ObjectPath()));
+    MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, dbus::ObjectPath()));
   }
 
  private:
@@ -261,7 +335,19 @@ class ShillManagerClientStubImpl : public ShillManagerClient {
     callback.Run(DBUS_METHOD_CALL_SUCCESS, stub_properties_);
   }
 
+  void NotifyObserversPropertyChanged(const std::string& property) {
+    base::Value* value;
+    if (!stub_properties_.GetWithoutPathExpansion(property, &value)) {
+      LOG(ERROR) << "Notify for unknown property: " << property;
+      return;
+    }
+    FOR_EACH_OBSERVER(ShillPropertyChangedObserver,
+                      observer_list_,
+                      OnPropertyChanged(property, *value));
+  }
+
   base::DictionaryValue stub_properties_;
+  ObserverList<ShillPropertyChangedObserver> observer_list_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.