Skip to content

GitLab

T
tangled
Commit 63f20cbf authored by haruki@chromium.org's avatar haruki@chromium.org
Browse files
Options

dbus: Remove unused MockExperimentalBluetooth*Client 

BUG=233121
TEST=unittests

Review URL: https://chromiumcodereview.appspot.com/14037011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195312 0039d316-1c4b-4281-b951-d872f2087c98
parent 5dce7657
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 337 deletions
chromeos/chromeos.gyp
View file @ 63f20cbf
......@@ -327,14 +327,6 @@
'dbus/mock_dbus_thread_manager.h',
'dbus/mock_debug_daemon_client.cc',
'dbus/mock_debug_daemon_client.h',
'dbus/mock_experimental_bluetooth_adapter_client.cc',
'dbus/mock_experimental_bluetooth_adapter_client.h',
'dbus/mock_experimental_bluetooth_agent_manager_client.cc',
'dbus/mock_experimental_bluetooth_agent_manager_client.h',
'dbus/mock_experimental_bluetooth_device_client.cc',
'dbus/mock_experimental_bluetooth_device_client.h',
'dbus/mock_experimental_bluetooth_profile_manager_client.cc',
'dbus/mock_experimental_bluetooth_profile_manager_client.h',
'dbus/mock_shill_device_client.cc',
'dbus/mock_shill_device_client.h',
'dbus/mock_shill_ipconfig_client.cc',
......
chromeos/dbus/mock_dbus_thread_manager.cc
View file @ 63f20cbf
......@@ -20,10 +20,6 @@
#include "chromeos/dbus/mock_cros_disks_client.h"
#include "chromeos/dbus/mock_cryptohome_client.h"
#include "chromeos/dbus/mock_debug_daemon_client.h"
#include "chromeos/dbus/mock_experimental_bluetooth_adapter_client.h"
#include "chromeos/dbus/mock_experimental_bluetooth_agent_manager_client.h"
#include "chromeos/dbus/mock_experimental_bluetooth_device_client.h"
#include "chromeos/dbus/mock_experimental_bluetooth_profile_manager_client.h"
#include "chromeos/dbus/mock_shill_device_client.h"
#include "chromeos/dbus/mock_shill_ipconfig_client.h"
#include "chromeos/dbus/mock_shill_manager_client.h"
......@@ -58,14 +54,6 @@ MockDBusThreadManager::MockDBusThreadManager()
mock_cros_disks_client_(new MockCrosDisksClient),
mock_cryptohome_client_(new MockCryptohomeClient),
mock_debugdaemon_client_(new MockDebugDaemonClient),
mock_experimental_bluetooth_adapter_client_(
new MockExperimentalBluetoothAdapterClient),
mock_experimental_bluetooth_agent_manager_client_(
new MockExperimentalBluetoothAgentManagerClient),
mock_experimental_bluetooth_device_client_(
new MockExperimentalBluetoothDeviceClient),
mock_experimental_bluetooth_profile_manager_client_(
new MockExperimentalBluetoothProfileManagerClient),
mock_shill_device_client_(new MockShillDeviceClient),
mock_shill_ipconfig_client_(new MockShillIPConfigClient),
mock_shill_manager_client_(new MockShillManagerClient),
......@@ -105,16 +93,6 @@ MockDBusThreadManager::MockDBusThreadManager()
.WillRepeatedly(Return(mock_cryptohome_client()));
EXPECT_CALL(*this, GetDebugDaemonClient())
.WillRepeatedly(Return(mock_debugdaemon_client()));
EXPECT_CALL(*this, GetExperimentalBluetoothAdapterClient())
.WillRepeatedly(Return(mock_experimental_bluetooth_adapter_client()));
EXPECT_CALL(*this, GetExperimentalBluetoothAgentManagerClient())
.WillRepeatedly(Return(
mock_experimental_bluetooth_agent_manager_client()));
EXPECT_CALL(*this, GetExperimentalBluetoothDeviceClient())
.WillRepeatedly(Return(mock_experimental_bluetooth_device_client()));
EXPECT_CALL(*this, GetExperimentalBluetoothProfileManagerClient())
.WillRepeatedly(Return(
mock_experimental_bluetooth_profile_manager_client()));
EXPECT_CALL(*this, GetShillDeviceClient())
.WillRepeatedly(Return(mock_shill_device_client()));
EXPECT_CALL(*this, GetShillIPConfigClient())
......@@ -216,18 +194,6 @@ MockDBusThreadManager::MockDBusThreadManager()
.Times(AnyNumber());
EXPECT_CALL(*mock_bluetooth_node_client_.get(), RemoveObserver(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_experimental_bluetooth_adapter_client_.get(),
AddObserver(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_experimental_bluetooth_adapter_client_.get(),
RemoveObserver(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_experimental_bluetooth_device_client_.get(),
AddObserver(_))
.Times(AnyNumber());
EXPECT_CALL(*mock_experimental_bluetooth_device_client_.get(),
RemoveObserver(_))
.Times(AnyNumber());
// Called from PowerMenuButton ctor.
EXPECT_CALL(*mock_power_manager_client_.get(), RequestStatusUpdate(_))
......
chromeos/dbus/mock_dbus_thread_manager.h
View file @ 63f20cbf
......@@ -29,10 +29,6 @@ class MockBluetoothOutOfBandClient;
class MockCrosDisksClient;
class MockCryptohomeClient;
class MockDebugDaemonClient;
class MockExperimentalBluetoothAdapterClient;
class MockExperimentalBluetoothAgentManagerClient;
class MockExperimentalBluetoothDeviceClient;
class MockExperimentalBluetoothProfileManagerClient;
class MockShillDeviceClient;
class MockShillIPConfigClient;
class MockShillManagerClient;
......@@ -141,22 +137,6 @@ class MockDBusThreadManager : public DBusThreadManager {
MockDebugDaemonClient* mock_debugdaemon_client() {
return mock_debugdaemon_client_.get();
}
MockExperimentalBluetoothAdapterClient*
mock_experimental_bluetooth_adapter_client() {
return mock_experimental_bluetooth_adapter_client_.get();
}
MockExperimentalBluetoothAgentManagerClient*
mock_experimental_bluetooth_agent_manager_client() {
return mock_experimental_bluetooth_agent_manager_client_.get();
}
MockExperimentalBluetoothDeviceClient*
mock_experimental_bluetooth_device_client() {
return mock_experimental_bluetooth_device_client_.get();
}
MockExperimentalBluetoothProfileManagerClient*
mock_experimental_bluetooth_profile_manager_client() {
return mock_experimental_bluetooth_profile_manager_client_.get();
}
MockShillDeviceClient* mock_shill_device_client() {
return mock_shill_device_client_.get();
}
......@@ -235,14 +215,6 @@ class MockDBusThreadManager : public DBusThreadManager {
scoped_ptr<MockCrosDisksClient> mock_cros_disks_client_;
scoped_ptr<MockCryptohomeClient> mock_cryptohome_client_;
scoped_ptr<MockDebugDaemonClient> mock_debugdaemon_client_;
scoped_ptr<MockExperimentalBluetoothAdapterClient>
mock_experimental_bluetooth_adapter_client_;
scoped_ptr<MockExperimentalBluetoothAgentManagerClient>
mock_experimental_bluetooth_agent_manager_client_;
scoped_ptr<MockExperimentalBluetoothDeviceClient>
mock_experimental_bluetooth_device_client_;
scoped_ptr<MockExperimentalBluetoothProfileManagerClient>
mock_experimental_bluetooth_profile_manager_client_;
scoped_ptr<MockShillDeviceClient> mock_shill_device_client_;
scoped_ptr<MockShillIPConfigClient> mock_shill_ipconfig_client_;
scoped_ptr<MockShillManagerClient> mock_shill_manager_client_;
......
chromeos/dbus/mock_experimental_bluetooth_adapter_client.cc deleted 100644 → 0
View file @ 5dce7657
// 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/mock_experimental_bluetooth_adapter_client.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
MockExperimentalBluetoothAdapterClient::Properties::Properties()
: ExperimentalBluetoothAdapterClient::Properties::Properties(
NULL,
bluetooth_adapter::kExperimentalBluetoothAdapterInterface,
PropertyChangedCallback()) {}
MockExperimentalBluetoothAdapterClient::Properties::~Properties() {}
MockExperimentalBluetoothAdapterClient::
MockExperimentalBluetoothAdapterClient() {}
MockExperimentalBluetoothAdapterClient::
~MockExperimentalBluetoothAdapterClient() {}
} // namespace chromeos
chromeos/dbus/mock_experimental_bluetooth_adapter_client.h deleted 100644 → 0
View file @ 5dce7657
// 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.
#ifndef CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
#define CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
#include <string>
#include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockExperimentalBluetoothAdapterClient
: public ExperimentalBluetoothAdapterClient {
public:
struct Properties : public ExperimentalBluetoothAdapterClient::Properties {
Properties();
virtual ~Properties();
MOCK_METHOD0(ConnectSignals, void());
MOCK_METHOD2(Get, void(dbus::PropertyBase* property,
dbus::PropertySet::GetCallback callback));
MOCK_METHOD0(GetAll, void());
MOCK_METHOD2(Set, void(dbus::PropertyBase* property,
dbus::PropertySet::SetCallback callback));
MOCK_METHOD1(ChangedReceived, void(dbus::Signal*));
};
MockExperimentalBluetoothAdapterClient();
virtual ~MockExperimentalBluetoothAdapterClient();
MOCK_METHOD1(AddObserver, void(Observer*));
MOCK_METHOD1(RemoveObserver, void(Observer*));
MOCK_METHOD0(GetAdapters, std::vector<dbus::ObjectPath>());
MOCK_METHOD1(GetProperties, Properties*(const dbus::ObjectPath&));
MOCK_METHOD3(StartDiscovery, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(StopDiscovery, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD4(RemoveDevice, void(const dbus::ObjectPath&,
const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
};
} // namespace chromeos
#endif // CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_ADAPTER_CLIENT_H_
chromeos/dbus/mock_experimental_bluetooth_agent_manager_client.cc deleted 100644 → 0
View file @ 5dce7657
// 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/mock_experimental_bluetooth_agent_manager_client.h"
namespace chromeos {
MockExperimentalBluetoothAgentManagerClient::
MockExperimentalBluetoothAgentManagerClient() {}
MockExperimentalBluetoothAgentManagerClient::
~MockExperimentalBluetoothAgentManagerClient() {}
} // namespace chromeos
chromeos/dbus/mock_experimental_bluetooth_agent_manager_client.h deleted 100644 → 0
View file @ 5dce7657
// 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.
#ifndef CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
#define CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
#include <string>
#include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockExperimentalBluetoothAgentManagerClient
: public ExperimentalBluetoothAgentManagerClient {
public:
MockExperimentalBluetoothAgentManagerClient();
virtual ~MockExperimentalBluetoothAgentManagerClient();
MOCK_METHOD4(RegisterAgent, void(const dbus::ObjectPath&,
const std::string&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(UnregisterAgent, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(RequestDefaultAgent, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
};
} // namespace chromeos
#endif // CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
chromeos/dbus/mock_experimental_bluetooth_device_client.cc deleted 100644 → 0
View file @ 5dce7657
// 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/mock_experimental_bluetooth_device_client.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
MockExperimentalBluetoothDeviceClient::Properties::Properties()
: ExperimentalBluetoothDeviceClient::Properties::Properties(
NULL,
bluetooth_device::kExperimentalBluetoothDeviceInterface,
PropertyChangedCallback()) {}
MockExperimentalBluetoothDeviceClient::Properties::~Properties() {}
MockExperimentalBluetoothDeviceClient::
MockExperimentalBluetoothDeviceClient() {}
MockExperimentalBluetoothDeviceClient::
~MockExperimentalBluetoothDeviceClient() {}
} // namespace chromeos
chromeos/dbus/mock_experimental_bluetooth_device_client.h deleted 100644 → 0
View file @ 5dce7657
// 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.
#ifndef CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
#define CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
#include <string>
#include "chromeos/dbus/experimental_bluetooth_device_client.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockExperimentalBluetoothDeviceClient
: public ExperimentalBluetoothDeviceClient {
public:
struct Properties : public ExperimentalBluetoothDeviceClient::Properties {
Properties();
virtual ~Properties();
MOCK_METHOD0(ConnectSignals, void());
MOCK_METHOD2(Get, void(dbus::PropertyBase* property,
dbus::PropertySet::GetCallback callback));
MOCK_METHOD0(GetAll, void());
MOCK_METHOD2(Set, void(dbus::PropertyBase* property,
dbus::PropertySet::SetCallback callback));
MOCK_METHOD1(ChangedReceived, void(dbus::Signal*));
};
MockExperimentalBluetoothDeviceClient();
virtual ~MockExperimentalBluetoothDeviceClient();
MOCK_METHOD1(AddObserver, void(Observer*));
MOCK_METHOD1(RemoveObserver, void(Observer*));
MOCK_METHOD1(GetDevicesForAdapter,
std::vector<dbus::ObjectPath>(const dbus::ObjectPath&));
MOCK_METHOD1(GetProperties, Properties*(const dbus::ObjectPath&));
MOCK_METHOD3(Connect, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(Disconnect, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD4(ConnectProfile, void(const dbus::ObjectPath&,
const std::string&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD4(DisconnectProfile, void(const dbus::ObjectPath&,
const std::string&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(Pair, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(CancelPairing, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
};
} // namespace chromeos
#endif // CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_DEVICE_CLIENT_H_
chromeos/dbus/mock_experimental_bluetooth_profile_manager_client.cc deleted 100644 → 0
View file @ 5dce7657
// 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/mock_experimental_bluetooth_profile_manager_client.h"
namespace chromeos {
MockExperimentalBluetoothProfileManagerClient::
MockExperimentalBluetoothProfileManagerClient() {}
MockExperimentalBluetoothProfileManagerClient::
~MockExperimentalBluetoothProfileManagerClient() {}
} // namespace chromeos
chromeos/dbus/mock_experimental_bluetooth_profile_manager_client.h deleted 100644 → 0
View file @ 5dce7657
// 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.
#ifndef CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
#define CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
#include <string>
#include "chromeos/dbus/experimental_bluetooth_profile_manager_client.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockExperimentalBluetoothProfileManagerClient
: public ExperimentalBluetoothProfileManagerClient {
public:
MockExperimentalBluetoothProfileManagerClient();
virtual ~MockExperimentalBluetoothProfileManagerClient();
MOCK_METHOD5(RegisterProfile, void(const dbus::ObjectPath&,
const std::string&,
const Options&,
const base::Closure&,
const ErrorCallback&));
MOCK_METHOD3(UnregisterProfile, void(const dbus::ObjectPath&,
const base::Closure&,
const ErrorCallback&));
};
} // namespace chromeos
#endif // CHROMEOS_DBUS_MOCK_EXPERIMENTAL_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment