Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_manager_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_manager_client_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
-#include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 // Used to compare values for finding entries to erase in a ListValue.
 // (ListValue only implements a const_iterator version of Find).
 struct ValueEquals {
@@ skipping 46 matching lines @@
 }  // namespace
 
 ShillManagerClientStub::ShillManagerClientStub()
     : weak_ptr_factory_(this) {
 }
 
 ShillManagerClientStub::~ShillManagerClientStub() {}
 
 // ShillManagerClient overrides.
 
-void ShillManagerClientStub::Init(dbus::Bus* bus) {
-  SetDefaultProperties();
-}
+void ShillManagerClientStub::Init(dbus::Bus* bus) {}
 
 void ShillManagerClientStub::AddPropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void ShillManagerClientStub::RemovePropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
@@ skipping 384 matching lines @@
     const std::string& service_path) {
   // Remove and insert the service, moving it to the front of the watch list.
   GetListProperty(flimflam::kServiceWatchListProperty)->Remove(
       base::StringValue(service_path), NULL);
   GetListProperty(flimflam::kServiceWatchListProperty)->Insert(
       0, base::Value::CreateStringValue(service_path));
   CallNotifyObserversPropertyChanged(
       flimflam::kServiceWatchListProperty, 0);
 }
 
-void ShillManagerClientStub::SetDefaultProperties() {
-  // Stub Technologies.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kDisableStubEthernet)) {
-    AddTechnology(flimflam::kTypeEthernet, true);
-  }
-  AddTechnology(flimflam::kTypeWifi, true);
-  AddTechnology(flimflam::kTypeCellular, true);
-  AddTechnology(flimflam::kTypeWimax, true);
-}
-
 void ShillManagerClientStub::PassStubProperties(
     const DictionaryValueCallback& callback) const {
   scoped_ptr<base::DictionaryValue> stub_properties(
       stub_properties_.DeepCopy());
   // Remove disabled services from the list.
   stub_properties->SetWithoutPathExpansion(
       flimflam::kServicesProperty,
       GetEnabledServiceList(flimflam::kServicesProperty));
   stub_properties->SetWithoutPathExpansion(
       flimflam::kServiceWatchListProperty,
@@ skipping 127 matching lines @@
                           flimflam::kScanningProperty,
                           base::FundamentalValue(false));
   }
   CallNotifyObserversPropertyChanged(flimflam::kServicesProperty, 0);
   CallNotifyObserversPropertyChanged(flimflam::kServiceWatchListProperty,
                                      0);
   base::MessageLoop::current()->PostTask(FROM_HERE, callback);
 }
 
 }  // namespace chromeos