Replace misc. network stub flags with more flexible ones

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/command_line.h"
 #include "base/observer_list.h"
@@ skipping 23 matching lines @@
 #include "chromeos/dbus/nfc_tag_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_stub_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 DBusThreadManager* g_dbus_thread_manager_for_testing = NULL;
@@ skipping 406 matching lines @@
 }
 
 // static
 void DBusThreadManager::InitializeWithStub() {
   // If we initialize DBusThreadManager twice we may also be shutting it down
   // early; do not allow that.
   CHECK(g_dbus_thread_manager == NULL);
   FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
   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";
 }
 
 // static
 bool DBusThreadManager::IsInitialized() {
   return g_dbus_thread_manager != NULL;
 }
 
 // static
 void DBusThreadManager::Shutdown() {
@@ skipping 82 matching lines @@
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos