Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2029)

Unified Diff: device/devices_app/usb/device_manager_impl_unittest.cc

Issue 1316203006: Convert DeviceManagerDelegate to PermissionProvider mojo interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/devices_app/usb/device_manager_impl_unittest.cc
diff --git a/device/devices_app/usb/device_manager_impl_unittest.cc b/device/devices_app/usb/device_manager_impl_unittest.cc
index e084430fb5aabfd55066be8f8e4432960c1cb683..55481616797fe9b52831e6efc522e091824524b1 100644
--- a/device/devices_app/usb/device_manager_impl_unittest.cc
+++ b/device/devices_app/usb/device_manager_impl_unittest.cc
@@ -14,7 +14,6 @@
#include "device/core/device_client.h"
#include "device/devices_app/usb/device_impl.h"
#include "device/devices_app/usb/device_manager_impl.h"
-#include "device/devices_app/usb/public/cpp/device_manager_delegate.h"
#include "device/usb/mock_usb_device.h"
#include "device/usb/mock_usb_device_handle.h"
#include "device/usb/mock_usb_service.h"
@@ -29,14 +28,21 @@ namespace usb {
namespace {
-class TestDeviceManagerDelegate : public DeviceManagerDelegate {
+class TestPermissionProvider : public PermissionProvider {
public:
- TestDeviceManagerDelegate() {}
- ~TestDeviceManagerDelegate() override {}
+ TestPermissionProvider(mojo::InterfaceRequest<PermissionProvider> request)
+ : binding_(this, request.Pass()) {}
+ ~TestPermissionProvider() override {}
+
+ void HasDevicePermission(
+ mojo::Array<mojo::String> requested_guids,
+ const HasDevicePermissionCallback& callback) override {
+ // Permission to access all devices granted.
+ callback.Run(requested_guids.Pass());
+ }
private:
- // DeviceManagerDelegate implementation:
- bool IsDeviceAllowed(const DeviceInfo& device_info) override { return true; }
+ mojo::StrongBinding<PermissionProvider> binding_;
};
class TestDeviceClient : public DeviceClient {
@@ -66,11 +72,12 @@ class USBDeviceManagerImplTest : public testing::Test {
}
DeviceManagerPtr ConnectToDeviceManager() {
+ PermissionProviderPtr permission_provider;
+ new TestPermissionProvider(mojo::GetProxy(&permission_provider));
DeviceManagerPtr device_manager;
- new DeviceManagerImpl(
- mojo::GetProxy(&device_manager),
- scoped_ptr<DeviceManagerDelegate>(new TestDeviceManagerDelegate),
- base::ThreadTaskRunnerHandle::Get());
+ new DeviceManagerImpl(mojo::GetProxy(&device_manager),
+ permission_provider.Pass(),
+ base::ThreadTaskRunnerHandle::Get());
return device_manager.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698