Convert DeviceManagerDelegate to PermissionProvider mojo interface.

device/devices_app/devices_app.cc

 // Copyright 2015 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 "device/devices_app/devices_app.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "device/core/device_client.h"
 #include "device/devices_app/usb/device_manager_impl.h"
-#include "device/devices_app/usb/public/cpp/device_manager_delegate.h"
 #include "device/usb/usb_service.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "url/gurl.h"
 
 namespace device {
 
 namespace {
 
 // The number of seconds to wait without any bound DeviceManagers before
 // exiting the app.
 const int64 kIdleTimeoutInSeconds = 10;
 
-// A usb::DeviceManagerDelegate implementation which provides origin-based
-// device access control.
-//
-// TODO(rockot/reillyg): We should just get rid of DeviceManagerDelegate, or
-// at least repurpose it as test support to provide device mocks.
-class USBDeviceManagerDelegate : public usb::DeviceManagerDelegate {
- public:
-  explicit USBDeviceManagerDelegate(const GURL& remote_url)
-      : remote_url_(remote_url) {}
-  ~USBDeviceManagerDelegate() override {}
-
- private:
-  // usb::DeviceManagerDelegate:
-  bool IsDeviceAllowed(const usb::DeviceInfo& device) override {
-    // Also let browser apps and mojo apptests talk to all devices.
-    if (remote_url_.SchemeIs("system") ||
-        remote_url_ == GURL("mojo://devices_apptests/"))
-      return true;
-    return false;
-  }
-
-  GURL remote_url_;
-
-  DISALLOW_COPY_AND_ASSIGN(USBDeviceManagerDelegate);
-};
-
 // A DeviceClient implementation to be constructed iff the app is not running
 // in an embedder that provides a DeviceClient (i.e. running as a standalone
 // Mojo app, not in Chrome).
 class AppDeviceClient : public DeviceClient {
  public:
   explicit AppDeviceClient(
       scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
       : blocking_task_runner_(blocking_task_runner) {}
   ~AppDeviceClient() override {}
 
@@ skipping 57 matching lines @@
   return true;
 }
 
 void DevicesApp::Quit() {
   service_initializer_.reset();
   app_impl_ = nullptr;
 }
 
 void DevicesApp::Create(mojo::ApplicationConnection* connection,
                         mojo::InterfaceRequest<usb::DeviceManager> request) {
-  scoped_ptr<usb::DeviceManagerDelegate> delegate(new USBDeviceManagerDelegate(
-      GURL(connection->GetRemoteApplicationURL())));
+  // Bind the new device manager to the connecting application's permission
+  // provider.
+  usb::PermissionProviderPtr permission_provider;
+  connection->ConnectToService(&permission_provider);
 
   // Owned by its message pipe.
   usb::DeviceManagerImpl* device_manager = new usb::DeviceManagerImpl(
-      request.Pass(), delegate.Pass(), service_task_runner_);
+      request.Pass(), permission_provider.Pass(), service_task_runner_);
   device_manager->set_connection_error_handler(
       base::Bind(&DevicesApp::OnConnectionError, base::Unretained(this)));
 
   active_device_manager_count_++;
   idle_timeout_callback_.Cancel();
 }
 
 void DevicesApp::OnConnectionError() {
   DCHECK_GE(active_device_manager_count_, 0u);
   active_device_manager_count_--;
   if (active_device_manager_count_ == 0) {
     // If the last DeviceManager connection has been dropped, kick off an idle
     // timeout to shut ourselves down.
     StartIdleTimer();
   }
 }
 
 void DevicesApp::StartIdleTimer() {
   // Passing unretained |app_impl_| is safe here because |app_impl_| is
   // guaranteed to outlive |this|, and the callback is canceled if |this| is
   // destroyed.
   idle_timeout_callback_.Reset(base::Bind(&mojo::ApplicationImpl::Quit,
                                           base::Unretained(app_impl_)));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, idle_timeout_callback_.callback(),
       base::TimeDelta::FromSeconds(kIdleTimeoutInSeconds));
 }
 
 }  // namespace device