diff options
author | reillyg <reillyg@chromium.org> | 2016-02-09 16:07:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 00:09:43 +0000 |
commit | 3497c50c52256d5f397579faf9c983d835c38d1d (patch) | |
tree | 857aa53608fbe6259256abfc7b6334a51f26971c | |
parent | 6d580816be15661d4b5153ec19bc2500f774dc8b (diff) | |
download | chromium_src-3497c50c52256d5f397579faf9c983d835c38d1d.zip chromium_src-3497c50c52256d5f397579faf9c983d835c38d1d.tar.gz chromium_src-3497c50c52256d5f397579faf9c983d835c38d1d.tar.bz2 |
Remove chromeos::PermissionBrokerClient::RequestPathAccess().
This method has been completely replaced by OpenPath().
BUG=None
Review URL: https://codereview.chromium.org/1686823002
Cr-Commit-Position: refs/heads/master@{#374540}
-rw-r--r-- | chromeos/dbus/fake_permission_broker_client.cc | 7 | ||||
-rw-r--r-- | chromeos/dbus/fake_permission_broker_client.h | 3 | ||||
-rw-r--r-- | chromeos/dbus/mock_permission_broker_client.h | 4 | ||||
-rw-r--r-- | chromeos/dbus/permission_broker_client.cc | 15 | ||||
-rw-r--r-- | chromeos/dbus/permission_broker_client.h | 10 |
5 files changed, 0 insertions, 39 deletions
diff --git a/chromeos/dbus/fake_permission_broker_client.cc b/chromeos/dbus/fake_permission_broker_client.cc index ace3479..548173b 100644 --- a/chromeos/dbus/fake_permission_broker_client.cc +++ b/chromeos/dbus/fake_permission_broker_client.cc @@ -54,13 +54,6 @@ void FakePermissionBrokerClient::CheckPathAccess( callback.Run(true); } -void FakePermissionBrokerClient::RequestPathAccess( - const std::string& path, - int interface_id, - const ResultCallback& callback) { - callback.Run(true); -} - void FakePermissionBrokerClient::OpenPath(const std::string& path, const OpenPathCallback& callback) { base::WorkerPool::PostTask(FROM_HERE, diff --git a/chromeos/dbus/fake_permission_broker_client.h b/chromeos/dbus/fake_permission_broker_client.h index b34d5c3..ee46101 100644 --- a/chromeos/dbus/fake_permission_broker_client.h +++ b/chromeos/dbus/fake_permission_broker_client.h @@ -22,9 +22,6 @@ class CHROMEOS_EXPORT FakePermissionBrokerClient void Init(dbus::Bus* bus) override; void CheckPathAccess(const std::string& path, const ResultCallback& callback) override; - void RequestPathAccess(const std::string& path, - int interface_id, - const ResultCallback& callback) override; void OpenPath(const std::string& path, const OpenPathCallback& callback) override; void RequestTcpPortAccess(uint16_t port, diff --git a/chromeos/dbus/mock_permission_broker_client.h b/chromeos/dbus/mock_permission_broker_client.h index 9e45a97..4d97b06 100644 --- a/chromeos/dbus/mock_permission_broker_client.h +++ b/chromeos/dbus/mock_permission_broker_client.h @@ -24,10 +24,6 @@ class MockPermissionBrokerClient : public PermissionBrokerClient { MOCK_METHOD1(Init, void(dbus::Bus* bus)); MOCK_METHOD2(CheckPathAccess, void(const std::string& path, const ResultCallback& callback)); - MOCK_METHOD3(RequestPathAccess, - void(const std::string& path, - int interface_id, - const ResultCallback& callback)); MOCK_METHOD2(OpenPath, void(const std::string& path, const OpenPathCallback& callback)); MOCK_METHOD4(RequestTcpPortAccess, diff --git a/chromeos/dbus/permission_broker_client.cc b/chromeos/dbus/permission_broker_client.cc index 5ddf0d4..fb0c934 100644 --- a/chromeos/dbus/permission_broker_client.cc +++ b/chromeos/dbus/permission_broker_client.cc @@ -22,7 +22,6 @@ using permission_broker::kPermissionBrokerServiceName; using permission_broker::kPermissionBrokerServicePath; using permission_broker::kReleaseTcpPort; using permission_broker::kReleaseUdpPort; -using permission_broker::kRequestPathAccess; using permission_broker::kRequestTcpPortAccess; using permission_broker::kRequestUdpPortAccess; @@ -42,20 +41,6 @@ class PermissionBrokerClientImpl : public PermissionBrokerClient { weak_ptr_factory_.GetWeakPtr(), callback)); } - void RequestPathAccess(const std::string& path, - const int interface_id, - const ResultCallback& callback) override { - dbus::MethodCall method_call(kPermissionBrokerInterface, - kRequestPathAccess); - dbus::MessageWriter writer(&method_call); - writer.AppendString(path); - writer.AppendInt32(interface_id); - proxy_->CallMethod(&method_call, - dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, - base::Bind(&PermissionBrokerClientImpl::OnResponse, - weak_ptr_factory_.GetWeakPtr(), callback)); - } - void OpenPath(const std::string& path, const OpenPathCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kOpenPath); diff --git a/chromeos/dbus/permission_broker_client.h b/chromeos/dbus/permission_broker_client.h index 87c24c8..276bfba 100644 --- a/chromeos/dbus/permission_broker_client.h +++ b/chromeos/dbus/permission_broker_client.h @@ -45,16 +45,6 @@ class CHROMEOS_EXPORT PermissionBrokerClient : public DBusClient { virtual void CheckPathAccess(const std::string& path, const ResultCallback& callback) = 0; - // RequestPathAccess requests access to a single device node identified by - // |path|. If |interface_id| value is passed (different than - // UsbDevicePermissionData::ANY_INTERFACE), the request will check if a - // specific interface is claimed while requesting access. - // This allows devices with multiple interfaces to be accessed even if - // some of them are already claimed by kernel. - virtual void RequestPathAccess(const std::string& path, - int interface_id, - const ResultCallback& callback) = 0; - // OpenPath requests that the permission broker open the device node // identified by |path| and return the resulting file descriptor. virtual void OpenPath(const std::string& path, |