Replace misc. network stub flags with more flexible ones

chromeos/dbus/dbus_thread_manager.cc

Index: chromeos/dbus/dbus_thread_manager.cc
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 64279ad89570694fa177a329b3de25bd659612ce..f3fdc0c4fd0dcba915bd3f1e6e69eeaa54443d9e 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -41,7 +41,6 @@
 #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_stub_helper.h"
 #include "chromeos/dbus/sms_client.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/dbus/update_engine_client.h"
@@ -469,7 +468,6 @@ void DBusThreadManager::InitializeWithStub() {
   fake_dbus_thread_manager->SetFakeClients();
   g_dbus_thread_manager = fake_dbus_thread_manager;
   InitializeClients();

[pneubeck (no reviews), 2014/02/28 09:37:59]

please make the SetupDefaultEnvironment explicit and not implicit on each
creation of the Shill*Clients:

fake_dbus_thread_manager->SetFakeClients();
scoped_ptr<FakeShillManagerClient> fake_shill_manager_client(new
FakeShillManagerClient);
fake_shill_manager_client->SetupDefaultEnvironment();
fake_dbus_thread_manager->SetShillManagerClient(scoped_ptr<ShillManagerClient>(fake_shill_manager_client));

if that's too much boilerplate for your taste, you could instead
pass a boolean setupDefaultEnvironment through some
FakeDBusThreadManager::SetupFake*Clients(...) but better don't change the
behavior of the existing SetupFakeClients().

[stevenjb, 2014/02/28 17:43:06]

Constructing the Fake manger client twice doesn't make any sense to me, but I'll
figure out a better way to do this.

-  shill_stub_helper::SetupDefaultEnvironment();
   VLOG(1) << "DBusThreadManager initialized with stub implementation";
 }