Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/dbus_thread_manager.cc

 // Copyright (c) 2012 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/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
-#include "chromeos/dbus/shill_device_client.h"
-#include "chromeos/dbus/shill_ipconfig_client.h"
-#include "chromeos/dbus/shill_manager_client.h"
-#include "chromeos/dbus/shill_profile_client.h"
-#include "chromeos/dbus/shill_service_client.h"
-#include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "chromeos/dbus/session_manager_client.h"
+#include "chromeos/dbus/shill_device_client.h"
+#include "chromeos/dbus/shill_ipconfig_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
+#include "chromeos/dbus/shill_profile_client.h"
+#include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/dbus/shill_test_helper.h"
 #include "chromeos/dbus/sms_client.h"
+#include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "dbus/bus.h"
 #include "dbus/dbus_statistics.h"
 
 namespace chromeos {
 
 static DBusThreadManager* g_dbus_thread_manager = NULL;
 static bool g_dbus_thread_manager_set_for_testing = false;
 
 // The DBusThreadManager implementation used in production.
@@ skipping 31 matching lines @@
   void InitializeClients() {
     InitClient(bluetooth_adapter_client_.get());
     InitClient(bluetooth_agent_manager_client_.get());
     InitClient(bluetooth_device_client_.get());
     InitClient(bluetooth_input_client_.get());
     InitClient(bluetooth_profile_manager_client_.get());
     InitClient(cras_audio_client_.get());
     InitClient(cros_disks_client_.get());
     InitClient(cryptohome_client_.get());
     InitClient(debug_daemon_client_.get());
-
-    // Initialization order of the Stub implementations of the Shill clients
-    // matters; stub clients may only have initialization dependencies on
-    // clients previously initialized.
     InitClient(shill_manager_client_.get());
     InitClient(shill_device_client_.get());
     InitClient(shill_ipconfig_client_.get());
     InitClient(shill_service_client_.get());
     InitClient(shill_profile_client_.get());
     InitClient(gsm_sms_client_.get());
-
-    // If the Service client has a TestInterface, add the default services.
-    ShillServiceClient::TestInterface* service_client_test =
-        DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
-    if (service_client_test)
-      service_client_test->AddDefaultServices();
-
     InitClient(image_burner_client_.get());
     InitClient(introspectable_client_.get());
     InitClient(modem_messaging_client_.get());
     InitClient(permission_broker_client_.get());
     InitClient(power_manager_client_.get());
     InitClient(session_manager_client_.get());
     InitClient(sms_client_.get());
     InitClient(system_clock_client_.get());
     InitClient(update_engine_client_.get());
 
     // PowerPolicyController is dependent on PowerManagerClient, so
     // initialize it after the main list of clients.
     power_policy_controller_.reset(
         new PowerPolicyController(this, power_manager_client_.get()));
 
+    shill_test_helper::SetupDefaultEnvironment();
+
     // This must be called after the list of clients so they've each had a
     // chance to register with their object managers.
     system_bus_->GetManagedObjects();
   }
 
   virtual ~DBusThreadManagerImpl() {
     FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_,
                       OnDBusThreadManagerDestroying(this));
 
     // Shut down the bus. During the browser shutdown, it's ok to shut down
@@ skipping 365 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos