Check USB device path access when prompting users to select a device.

chromeos/network/firewall_hole_unittest.cc

Index: chromeos/network/firewall_hole_unittest.cc
diff --git a/chromeos/network/firewall_hole_unittest.cc b/chromeos/network/firewall_hole_unittest.cc
index ea5f5ec300ce58a00e9e01470564059e3d9e41af..3032d5b81c0ba0bf5e39509a35901cc18e85ce19 100644
--- a/chromeos/network/firewall_hole_unittest.cc
+++ b/chromeos/network/firewall_hole_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_permission_broker_client.h"
+#include "chromeos/dbus/mock_permission_broker_client.h"
 #include "chromeos/network/firewall_hole.h"
 #include "dbus/file_descriptor.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -13,6 +13,7 @@
 
 using chromeos::DBusThreadManager;
 using chromeos::FirewallHole;
+using chromeos::MockPermissionBrokerClient;
 using testing::_;
 
 namespace {
@@ -23,36 +24,6 @@ ACTION_TEMPLATE(InvokeCallback,
   ::std::tr1::get<k>(args).Run(p1);
 }
 
-class MockPermissionsBrokerClient : public chromeos::PermissionBrokerClient {
- public:
-  MockPermissionsBrokerClient() {}
-  ~MockPermissionsBrokerClient() override {}
-
-  MOCK_METHOD1(Init, void(dbus::Bus* bus));
-  MOCK_METHOD3(RequestPathAccess,
-               void(const std::string& path,
-                    int interface_id,
-                    const ResultCallback& callback));
-  MOCK_METHOD4(RequestTcpPortAccess,
-               void(uint16 port,
-                    const std::string& interface,
-                    const dbus::FileDescriptor& lifeline_fd,
-                    const ResultCallback& callback));
-  MOCK_METHOD4(RequestUdpPortAccess,
-               void(uint16 port,
-                    const std::string& interface,
-                    const dbus::FileDescriptor& lifeline_fd,
-                    const ResultCallback& callback));
-  MOCK_METHOD3(ReleaseTcpPort,
-               void(uint16 port,
-                    const std::string& interface,
-                    const ResultCallback& callback));
-  MOCK_METHOD3(ReleaseUdpPort,
-               void(uint16 port,
-                    const std::string& interface,
-                    const ResultCallback& callback));
-};
-
 }  // namespace
 
 class FirewallHoleTest : public testing::Test {
@@ -61,9 +32,9 @@ class FirewallHoleTest : public testing::Test {
   ~FirewallHoleTest() override {}
 
   void SetUp() override {
-    mock_permissions_broker_client_ = new MockPermissionsBrokerClient();
+    mock_permission_broker_client_ = new MockPermissionBrokerClient();
     DBusThreadManager::GetSetterForTesting()->SetPermissionBrokerClient(
-        make_scoped_ptr(mock_permissions_broker_client_));
+        make_scoped_ptr(mock_permission_broker_client_));
   }
 
   void TearDown() override { DBusThreadManager::Shutdown(); }
@@ -83,14 +54,14 @@ class FirewallHoleTest : public testing::Test {
 
  protected:
   base::RunLoop run_loop_;
-  MockPermissionsBrokerClient* mock_permissions_broker_client_ = nullptr;
+  MockPermissionBrokerClient* mock_permission_broker_client_ = nullptr;
 };
 
 TEST_F(FirewallHoleTest, GrantTcpPortAccess) {
-  EXPECT_CALL(*mock_permissions_broker_client_,
+  EXPECT_CALL(*mock_permission_broker_client_,
               RequestTcpPortAccess(1234, "foo0", _, _))
       .WillOnce(InvokeCallback<3>(true));
-  EXPECT_CALL(*mock_permissions_broker_client_, ReleaseTcpPort(1234, "foo0", _))
+  EXPECT_CALL(*mock_permission_broker_client_, ReleaseTcpPort(1234, "foo0", _))
       .WillOnce(InvokeCallback<2>(true));
 
   FirewallHole::Open(
@@ -100,7 +71,7 @@ TEST_F(FirewallHoleTest, GrantTcpPortAccess) {
 }
 
 TEST_F(FirewallHoleTest, DenyTcpPortAccess) {
-  EXPECT_CALL(*mock_permissions_broker_client_,
+  EXPECT_CALL(*mock_permission_broker_client_,
               RequestTcpPortAccess(1234, "foo0", _, _))
       .WillOnce(InvokeCallback<3>(false));
 
@@ -111,10 +82,10 @@ TEST_F(FirewallHoleTest, DenyTcpPortAccess) {
 }
 
 TEST_F(FirewallHoleTest, GrantUdpPortAccess) {
-  EXPECT_CALL(*mock_permissions_broker_client_,
+  EXPECT_CALL(*mock_permission_broker_client_,
               RequestUdpPortAccess(1234, "foo0", _, _))
       .WillOnce(InvokeCallback<3>(true));
-  EXPECT_CALL(*mock_permissions_broker_client_, ReleaseUdpPort(1234, "foo0", _))
+  EXPECT_CALL(*mock_permission_broker_client_, ReleaseUdpPort(1234, "foo0", _))
       .WillOnce(InvokeCallback<2>(true));
 
   FirewallHole::Open(
@@ -124,7 +95,7 @@ TEST_F(FirewallHoleTest, GrantUdpPortAccess) {
 }
 
 TEST_F(FirewallHoleTest, DenyUdpPortAccess) {
-  EXPECT_CALL(*mock_permissions_broker_client_,
+  EXPECT_CALL(*mock_permission_broker_client_,
               RequestUdpPortAccess(1234, "foo0", _, _))
       .WillOnce(InvokeCallback<3>(false));