Call Device.SetCarrier when the ONC Carrier property is specified.

chromeos/dbus/fake_shill_device_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_device_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 16 matching lines @@
 
 std::string kSimPin = "1111";
 
 void ErrorFunction(const std::string& device_path,
                    const std::string& error_name,
                    const std::string& error_message) {
   LOG(ERROR) << "Shill Error for: " << device_path
              << ": " << error_name << " : " << error_message;
 }
 
-void PostNotFoundError(
-    const ShillDeviceClient::ErrorCallback& error_callback) {
-  std::string error_message("Failed");
+void PostError(const std::string& error,
+               const ShillDeviceClient::ErrorCallback& error_callback) {
   base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(error_callback, shill::kErrorResultNotFound, error_message));
+      FROM_HERE, base::Bind(error_callback, error, "Failed"));

[pneubeck (no reviews), 2015/03/27 18:26:46]

I don't feel particularly confident in Bind + const char*
Can you keep the argument wrapped into a std::string?

[stevenjb, 2015/03/27 23:18:04]

I'm pretty sure it will get converted to a string, but went ahead and made it a
file scoped const.

+}
+
+void PostNotFoundError(const ShillDeviceClient::ErrorCallback& error_callback) {
+  PostError(shill::kErrorResultNotFound, error_callback);
+}
+
+bool IsReadOnlyProperty(const std::string& name) {
+  if (name == shill::kCarrierProperty)
+    return true;
+  return false;
 }
 
 }  // namespace
 
 FakeShillDeviceClient::FakeShillDeviceClient()
     : initial_tdls_busy_count_(0),
       tdls_busy_count_(0),
       weak_ptr_factory_(this) {
 }
 
@@ skipping 32 matching lines @@
     const dbus::ObjectPath& device_path,
     const VoidDBusMethodCallback& callback) {
   PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);
 }
 
 void FakeShillDeviceClient::SetProperty(const dbus::ObjectPath& device_path,
                                         const std::string& name,
                                         const base::Value& value,
                                         const base::Closure& callback,
                                         const ErrorCallback& error_callback) {
+  if (IsReadOnlyProperty(name))
+    PostError(shill::kErrorResultInvalidArguments, error_callback);
+  AlwaysSetProperty(device_path, name, value, callback, error_callback);
+}
+
+void FakeShillDeviceClient::AlwaysSetProperty(
+    const dbus::ObjectPath& device_path,
+    const std::string& name,
+    const base::Value& value,
+    const base::Closure& callback,
+    const ErrorCallback& error_callback) {
   base::DictionaryValue* device_properties = NULL;
   if (!stub_devices_.GetDictionaryWithoutPathExpansion(device_path.value(),
                                                        &device_properties)) {
     PostNotFoundError(error_callback);
     return;
   }
   device_properties->SetWithoutPathExpansion(name, value.DeepCopy());
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&FakeShillDeviceClient::NotifyObserversPropertyChanged,
@@ skipping 113 matching lines @@
     PostNotFoundError(error_callback);
     return;
   }
   base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 void FakeShillDeviceClient::SetCarrier(const dbus::ObjectPath& device_path,
                                        const std::string& carrier,
                                        const base::Closure& callback,
                                        const ErrorCallback& error_callback) {
-  if (!stub_devices_.HasKey(device_path.value())) {
-    PostNotFoundError(error_callback);
-    return;
-  }
-  base::MessageLoop::current()->PostTask(FROM_HERE, callback);
+  AlwaysSetProperty(device_path, shill::kCarrierProperty,
+                    base::StringValue(carrier), callback, error_callback);
 }
 
 void FakeShillDeviceClient::Reset(const dbus::ObjectPath& device_path,
                                   const base::Closure& callback,
                                   const ErrorCallback& error_callback) {
   if (!stub_devices_.HasKey(device_path.value())) {
     PostNotFoundError(error_callback);
     return;
   }
   base::MessageLoop::current()->PostTask(FROM_HERE, callback);
@@ skipping 229 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