Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_device_client_stub.cc

 // Copyright (c) 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/shill_device_client_stub.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 21 matching lines @@
 ShillDeviceClientStub::ShillDeviceClientStub() : weak_ptr_factory_(this) {
 }
 
 ShillDeviceClientStub::~ShillDeviceClientStub() {
   STLDeleteContainerPairSecondPointers(
       observer_list_.begin(), observer_list_.end());
 }
 
 // ShillDeviceClient overrides.
 
-void ShillDeviceClientStub::Init(dbus::Bus* bus) {
-  SetDefaultProperties();
-}
+void ShillDeviceClientStub::Init(dbus::Bus* bus) {}
 
 void ShillDeviceClientStub::AddPropertyChangedObserver(
     const dbus::ObjectPath& device_path,
     ShillPropertyChangedObserver* observer){
   GetObserverList(device_path).AddObserver(observer);
 }
 
 void ShillDeviceClientStub::RemovePropertyChangedObserver(
     const dbus::ObjectPath& device_path,
     ShillPropertyChangedObserver* observer){
@@ skipping 172 matching lines @@
     std::string prop_type;
     if (!properties->GetStringWithoutPathExpansion(
             flimflam::kTypeProperty, &prop_type) ||
         prop_type != type)
       continue;
     return iter.key();
   }
   return std::string();
 }
 
-void ShillDeviceClientStub::SetDefaultProperties() {
-  // Add a wifi device.
-  AddDevice("stub_wifi_device1", flimflam::kTypeWifi, "/device/wifi1");
-
-  // Add a cellular device. Used in SMS stub.
-  AddDevice("stub_cellular_device1", flimflam::kTypeCellular,
-            "/device/cellular1");
-  base::DictionaryValue* properties =
-      GetDeviceProperties("stub_cellular_device1");
-  properties->SetStringWithoutPathExpansion(flimflam::kCarrierProperty,
-                                            shill::kCarrierSprint);
-
-  // Add a wimax device.
-  AddDevice("stub_wimax_device1", flimflam::kTypeWimax,
-            "/device/wimax1");
-}
-
 void ShillDeviceClientStub::PassStubDeviceProperties(
     const dbus::ObjectPath& device_path,
     const DictionaryValueCallback& callback) const {
   const base::DictionaryValue* device_properties = NULL;
   if (!stub_devices_.GetDictionaryWithoutPathExpansion(
       device_path.value(), &device_properties)) {
     base::DictionaryValue empty_dictionary;
     callback.Run(DBUS_METHOD_CALL_FAILURE, empty_dictionary);
     return;
   }
@@ skipping 44 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