Commit 2da5c725 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Remove use of MockCOMInterface in PlatformSensorAndProviderTestWin

Individual classes now extend from Microsoft::WRL::RuntimeClass.

BUG=1014283

Change-Id: I2c95a380134ea60756eb5115ba3209ce520b680b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862118
Commit-Queue: Robert Liao <robliao@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Auto-Submit: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706070}
parent 955a238b
...@@ -35,17 +35,11 @@ namespace device { ...@@ -35,17 +35,11 @@ namespace device {
using mojom::SensorType; using mojom::SensorType;
template <class Interface> // Mock class for ISensorManager COM interface.
class MockCOMInterface class MockISensorManager
: public Microsoft::WRL::RuntimeClass< : public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>, Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
Interface> { ISensorManager> {
protected:
~MockCOMInterface() override = default;
};
// Mock class for ISensorManager COM interface.
class MockISensorManager : public MockCOMInterface<ISensorManager> {
public: public:
// ISensorManager interface // ISensorManager interface
MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
...@@ -73,7 +67,10 @@ class MockISensorManager : public MockCOMInterface<ISensorManager> { ...@@ -73,7 +67,10 @@ class MockISensorManager : public MockCOMInterface<ISensorManager> {
}; };
// Mock class for ISensorCollection COM interface. // Mock class for ISensorCollection COM interface.
class MockISensorCollection : public MockCOMInterface<ISensorCollection> { class MockISensorCollection
: public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
ISensorCollection> {
public: public:
// ISensorCollection interface // ISensorCollection interface
MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
...@@ -96,7 +93,10 @@ class MockISensorCollection : public MockCOMInterface<ISensorCollection> { ...@@ -96,7 +93,10 @@ class MockISensorCollection : public MockCOMInterface<ISensorCollection> {
}; };
// Mock class for ISensor COM interface. // Mock class for ISensor COM interface.
class MockISensor : public MockCOMInterface<ISensor> { class MockISensor
: public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
ISensor> {
public: public:
// ISensor interface // ISensor interface
MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetID, HRESULT(SENSOR_ID* id)); MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetID, HRESULT(SENSOR_ID* id));
...@@ -153,7 +153,10 @@ class MockISensor : public MockCOMInterface<ISensor> { ...@@ -153,7 +153,10 @@ class MockISensor : public MockCOMInterface<ISensor> {
}; };
// Mock class for ISensorDataReport COM interface. // Mock class for ISensorDataReport COM interface.
class MockISensorDataReport : public MockCOMInterface<ISensorDataReport> { class MockISensorDataReport
: public Microsoft::WRL::RuntimeClass<
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
ISensorDataReport> {
public: public:
// ISensorDataReport interface // ISensorDataReport interface
MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE,
......
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