#include "base/strings/string_piece.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/dbus/mock_shill_manager_client.h"
#include "chromeos/dbus/mock_shill_profile_client.h"
#include "chromeos/dbus/mock_shill_service_client.h"
virtual ~NetworkConfigurationHandlerTest() {}
virtual void SetUp() OVERRIDE {
- FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager;
+ scoped_ptr<DBusThreadManagerSetter> dbus_setter =
+ DBusThreadManager::GetSetterForTesting();
mock_manager_client_ = new MockShillManagerClient();
mock_profile_client_ = new MockShillProfileClient();
mock_service_client_ = new MockShillServiceClient();
- dbus_thread_manager->SetShillManagerClient(
+ dbus_setter->SetShillManagerClient(
scoped_ptr<ShillManagerClient>(mock_manager_client_).Pass());
- dbus_thread_manager->SetShillProfileClient(
+ dbus_setter->SetShillProfileClient(
scoped_ptr<ShillProfileClient>(mock_profile_client_).Pass());
- dbus_thread_manager->SetShillServiceClient(
+ dbus_setter->SetShillServiceClient(
scoped_ptr<ShillServiceClient>(mock_service_client_).Pass());
EXPECT_CALL(*mock_service_client_, GetProperties(_, _))
EXPECT_CALL(*mock_manager_client_, RemovePropertyChangedObserver(_))
.Times(AnyNumber());
- DBusThreadManager::InitializeForTesting(dbus_thread_manager);
-
network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
network_configuration_handler_.reset(new NetworkConfigurationHandler());
network_configuration_handler_->Init(network_state_handler_.get());
}
virtual void SetUp() OVERRIDE {
- DBusThreadManager::InitializeWithStub();
+ DBusThreadManager::Initialize();
network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
test_observer_.reset(new TestObserver());