ArcUsbPermissionDialog

Hookup permission dialog view. Add browser_test.

Bug: 776476
Change-Id: I30405949ba50591030a4645f0d7feb1f4fefc03d
Reviewed-on: https://chromium-review.googlesource.com/907691Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Commit-Queue: Long Cheng <lgcheng@google.com>
Cr-Commit-Position: refs/heads/master@{#541260}

chrome/app/chromeos_strings.grdp

@@ -4661,6 +4661,15 @@
   <message name="IDS_ARC_MIGRATE_ENCRYPTION_SUCCESS_MESSAGE" desc="Message of the toast shown on the first sign-in after the successfully completed migration needed for using Android apps.">
     You can now use Android apps.
   </message>
+  <message name="IDS_ARC_USB_PERMISSION_TITLE" desc="Titlebar of Android app USB permissions prompt window">
+    Confirm USB Permission
+  </message>
+  <message name="IDS_ARC_USB_SCAN_DEVICE_LIST_PERMISSION_HEADING" desc="Heading text in the content area of the Android app scan device list permission prompt. Tells the user the app will be able to scan attached USB device list if confirmed.">
+    Allow "<ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph>" to get the list of your attached USB devices?
+  </message>
+  <message name="IDS_ARC_USB_ACCESS_PERMISSION_HEADING" desc="Heading text in the content area of the Android app USB device access permission prompt. Tells the user the app will be able to access the usb device if confirmed.">
+    Allow "<ph name="APP_NAME">$1<ex>Gmail Checker</ex></ph>" to access:
+  </message>
   <message name="IDS_VOICE_INTERACTION_VALUE_PROP_LOADING" desc="Loading message of the voice interaction value prop dialog.">
     Loading Google Assistant...
   </message>

chrome/browser/ui/app_list/arc/arc_app_dialog.h

@@ -14,6 +14,8 @@ class Profile;
 
 namespace arc {
 
+using ArcUsbConfirmCallback = base::OnceCallback<void(bool)>;
+
 // Shows a dialog for user to confirm uninstallation of ARC app.
 // Currently, ARC app can only be manually uninstalled from AppList. But it
 // would be simple to enable the dialog to shown from other source.
@@ -21,6 +23,17 @@ void ShowArcAppUninstallDialog(Profile* profile,
                                AppListControllerDelegate* controller,
                                const std::string& app_id);
 
+// Shows permission request dialog for scan USB device list.
+void ShowUsbScanDeviceListPermissionDialog(Profile* profile,
+                                           const std::string& app_id,
+                                           ArcUsbConfirmCallback callback);
+
+// Shows permission request dialog for targeting device name.
+void ShowUsbAccessPermissionDialog(Profile* profile,
+                                   const std::string& app_id,
+                                   const base::string16& device_name,
+                                   ArcUsbConfirmCallback callback);
+
 // Test purpose methods.
 bool IsArcAppDialogViewAliveForTest();
 

chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_dialog.h"
 #include "chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager_factory.h"
 #include "components/arc/usb/usb_host_bridge.h"
 #include "extensions/browser/api/device_permissions_manager.h"
@@ -254,7 +255,7 @@ void ArcUsbHostPermissionManager::MaybeProcessNextPermissionRequest() {
     if (HasUsbScanDeviceListPermission(current_requesting_package_)) {
       OnUsbPermissionReceived(std::move(current_request), true);
     } else {
-      ShowScanDeviceListPermissionDialog(
+      ShowUsbScanDeviceListPermissionDialog(
           profile_, app_id,
           base::BindOnce(&ArcUsbHostPermissionManager::OnUsbPermissionReceived,
                          weak_ptr_factory_.GetWeakPtr(),
@@ -265,7 +266,7 @@ void ArcUsbHostPermissionManager::MaybeProcessNextPermissionRequest() {
                                *current_request.usb_device_entry())) {
       OnUsbPermissionReceived(std::move(current_request), true);
     } else {
-      ShowAccessPermissionDialog(
+      ShowUsbAccessPermissionDialog(
           profile_, app_id, current_request.usb_device_entry()->device_name,
           base::BindOnce(&ArcUsbHostPermissionManager::OnUsbPermissionReceived,
                          weak_ptr_factory_.GetWeakPtr(),

chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h

@@ -24,8 +24,6 @@ namespace arc {
 
 class ArcUsbHostBridge;
 
-using ArcUsbConfirmCallback = base::OnceCallback<void(bool)>;
-
 class ArcUsbHostPermissionManager : public ArcAppListPrefs::Observer,
                                     public ArcUsbHostUiDelegate,
                                     public KeyedService {
@@ -102,18 +100,6 @@ class ArcUsbHostPermissionManager : public ArcAppListPrefs::Observer,
   static ArcUsbHostPermissionManager* GetForBrowserContext(
       content::BrowserContext* context);
 
-  // Shows permission request dialog for scan USB device list.
-  static void ShowScanDeviceListPermissionDialog(
-      Profile* profile,
-      const std::string& app_id,
-      ArcUsbConfirmCallback callback);
-
-  // Shows permission request dialog for targeting device name.
-  static void ShowAccessPermissionDialog(Profile* profile,
-                                         const std::string& app_id,
-                                         const base::string16& device_name,
-                                         ArcUsbConfirmCallback callback);
-
   // ArcUsbHostUiDelegate:
   void RequestUsbScanDeviceListPermission(
       const std::string& package_name,

chrome/browser/ui/views/arc_app_dialog_view.cc

@@ -14,6 +14,7 @@
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
@@ -38,8 +39,7 @@ const int kIconSize = 64;
 // Currenty ARC apps only support 48*48 native icon.
 const int kIconSourceSize = 48;
 
-using ArcAppConfirmCallback =
-    base::Callback<void(const std::string& app_id, Profile* profile)>;
+using ArcAppConfirmCallback = base::OnceCallback<void(bool accept)>;
 
 class ArcAppDialogView : public views::DialogDelegateView,
                          public AppIconLoaderDelegate {
@@ -67,6 +67,7 @@ class ArcAppDialogView : public views::DialogDelegateView,
   // views::DialogDelegate:
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool Accept() override;
+  bool Cancel() override;
 
   // AppIconLoaderDelegate:
   void OnAppImageUpdated(const std::string& app_id,
@@ -96,7 +97,7 @@ class ArcAppDialogView : public views::DialogDelegateView,
   DISALLOW_COPY_AND_ASSIGN(ArcAppDialogView);
 };
 
-// Browertest use only. Global pointer of ArcAppDialogView which is shown.
+// Browsertest use only. Global pointer of currently shown ArcAppDialogView.
 ArcAppDialogView* g_current_arc_app_dialog_view = nullptr;
 
 ArcAppDialogView::ArcAppDialogView(Profile* profile,
@@ -114,9 +115,7 @@ ArcAppDialogView::ArcAppDialogView(Profile* profile,
       window_title_(window_title),
       confirm_button_text_(confirm_button_text),
       cancel_button_text_(cancel_button_text),
-      confirm_callback_(confirm_callback) {
-  DCHECK(controller);
-
+      confirm_callback_(std::move(confirm_callback)) {
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
 
   SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -150,7 +149,8 @@ ArcAppDialogView::ArcAppDialogView(Profile* profile,
 }
 
 ArcAppDialogView::~ArcAppDialogView() {
-  g_current_arc_app_dialog_view = nullptr;
+  if (g_current_arc_app_dialog_view == this)
+    g_current_arc_app_dialog_view = nullptr;
 }
 
 void ArcAppDialogView::AddMultiLineLabel(views::View* parent,
@@ -192,7 +192,14 @@ base::string16 ArcAppDialogView::GetDialogButtonLabel(
 }
 
 bool ArcAppDialogView::Accept() {
-  confirm_callback_.Run(app_id_, profile_);
+  if (confirm_callback_)
+    std::move(confirm_callback_).Run(true);
+  return true;
+}
+
+bool ArcAppDialogView::Cancel() {
+  if (confirm_callback_)
+    std::move(confirm_callback_).Run(false);
   return true;
 }
 
@@ -213,7 +220,9 @@ void ArcAppDialogView::Show() {
   initial_setup_ = false;
 
   // The parent window was killed before the icon was loaded.
-  if (!AppListService::Get()->IsAppListVisible()) {
+  // TODO(lgcheng@) : Remove this since the dialog is not parented to applist
+  // anymore.
+  if (controller_ && !AppListService::Get()->IsAppListVisible()) {
     g_current_arc_app_dialog_view = nullptr;
     Cancel();
     DialogDelegateView::DeleteDelegate();
@@ -227,16 +236,26 @@ void ArcAppDialogView::Show() {
   constrained_window::CreateBrowserModalDialogViews(this, nullptr)->Show();
 }
 
+void HandleArcAppUninstall(base::OnceClosure closure, bool accept) {
+  if (accept)
+    std::move(closure).Run();
+}
+
+std::unique_ptr<ArcAppListPrefs::AppInfo> GetArcAppInfo(
+    Profile* profile,
+    const std::string& app_id) {
+  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile);
+  DCHECK(arc_prefs);
+  return arc_prefs->GetApp(app_id);
+}
+
 }  // namespace
 
 void ShowArcAppUninstallDialog(Profile* profile,
                                AppListControllerDelegate* controller,
                                const std::string& app_id) {
-  ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile);
-  DCHECK(arc_prefs);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
-      arc_prefs->GetApp(app_id);
-
+      GetArcAppInfo(profile, app_id);
   if (!app_info)
     return;
 
@@ -260,11 +279,67 @@ void ShowArcAppUninstallDialog(Profile* profile,
       is_shortcut ? IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON
                   : IDS_EXTENSION_PROMPT_UNINSTALL_APP_BUTTON);
 
+  base::string16 cancel_button_text = l10n_util::GetStringUTF16(IDS_CANCEL);
+  new ArcAppDialogView(
+      profile, controller, app_id, window_title, heading_text, subheading_text,
+      confirm_button_text, cancel_button_text,
+      base::BindOnce(HandleArcAppUninstall,
+                     base::BindOnce(UninstallArcApp, app_id, profile)));
+}
+
+void ShowUsbScanDeviceListPermissionDialog(Profile* profile,
+                                           const std::string& app_id,
+                                           ArcUsbConfirmCallback callback) {
+  std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
+      GetArcAppInfo(profile, app_id);
+  if (!app_info) {
+    std::move(callback).Run(false);
+    return;
+  }
+
+  base::string16 window_title =
+      l10n_util::GetStringUTF16(IDS_ARC_USB_PERMISSION_TITLE);
+
+  base::string16 heading_text = l10n_util::GetStringFUTF16(
+      IDS_ARC_USB_SCAN_DEVICE_LIST_PERMISSION_HEADING,
+      base::UTF8ToUTF16(app_info->name));
+
+  base::string16 confirm_button_text = l10n_util::GetStringUTF16(IDS_OK);
+
+  base::string16 cancel_button_text = l10n_util::GetStringUTF16(IDS_CANCEL);
+
+  new ArcAppDialogView(profile, nullptr /*controller*/, app_id, window_title,
+                       heading_text, base::string16() /*subheading_text*/,
+                       confirm_button_text, cancel_button_text,
+                       std::move(callback));
+}
+
+void ShowUsbAccessPermissionDialog(Profile* profile,
+                                   const std::string& app_id,
+                                   const base::string16& device_name,
+                                   ArcUsbConfirmCallback callback) {
+  std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
+      GetArcAppInfo(profile, app_id);
+  if (!app_info) {
+    std::move(callback).Run(false);
+    return;
+  }
+
+  base::string16 window_title =
+      l10n_util::GetStringUTF16(IDS_ARC_USB_PERMISSION_TITLE);
+
+  base::string16 heading_text = l10n_util::GetStringFUTF16(
+      IDS_ARC_USB_ACCESS_PERMISSION_HEADING, base::UTF8ToUTF16(app_info->name));
+
+  base::string16 subheading_text = device_name;
+
+  base::string16 confirm_button_text = l10n_util::GetStringUTF16(IDS_OK);
+
   base::string16 cancel_button_text = l10n_util::GetStringUTF16(IDS_CANCEL);
 
-  new ArcAppDialogView(profile, controller, app_id, window_title, heading_text,
-                       subheading_text, confirm_button_text, cancel_button_text,
-                       base::Bind(UninstallArcApp));
+  new ArcAppDialogView(profile, nullptr /*controller*/, app_id, window_title,
+                       heading_text, subheading_text, confirm_button_text,
+                       cancel_button_text, std::move(callback));
 }
 
 bool IsArcAppDialogViewAliveForTest() {

chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc

@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -15,6 +16,7 @@
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ui/app_list/arc/arc_usb_host_permission_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -30,8 +32,7 @@ class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
  public:
   ArcAppUninstallDialogViewBrowserTest() {}
 
-  // InProcessBrowserTest:
-  ~ArcAppUninstallDialogViewBrowserTest() override {}
+  ~ArcAppUninstallDialogViewBrowserTest() override = default;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     arc::SetArcAvailableCommandLineForTesting(command_line);
@@ -65,20 +66,20 @@ class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
 
     // In this setup, we have one app and one shortcut which share one package.
     mojom::AppInfo app;
-    app.name = base::StringPrintf("Fake App %d", 0);
-    app.package_name = base::StringPrintf("fake.package.%d", 0);
-    app.activity = base::StringPrintf("fake.app.%d.activity", 0);
+    app.name = "Fake App 0";
+    app.package_name = "fake.package.0";
+    app.activity = "fake.app.0.activity";
     app.sticky = false;
     app_instance_->SendRefreshAppList(std::vector<mojom::AppInfo>(1, app));
 
     mojom::ShortcutInfo shortcut;
-    shortcut.name = base::StringPrintf("Fake Shortcut %d", 0);
-    shortcut.package_name = base::StringPrintf("fake.package.%d", 0);
-    shortcut.intent_uri = base::StringPrintf("Fake Shortcut uri %d", 0);
+    shortcut.name = "Fake Shortcut 0";
+    shortcut.package_name = "fake.package.0";
+    shortcut.intent_uri = "Fake Shortcut uri 0";
     app_instance_->SendInstallShortcut(shortcut);
 
     mojom::ArcPackageInfo package;
-    package.package_name = base::StringPrintf("fake.package.%d", 0);
+    package.package_name = "fake.package.0";
     package.package_version = 0;
     package.last_backup_android_id = 0;
     package.last_backup_time = 0;
@@ -101,6 +102,8 @@ class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
 
   FakeAppInstance* instance() { return app_instance_.get(); }
 
+  Profile* profile() { return profile_; }
+
  private:
   ArcAppListPrefs* arc_app_list_pref_ = nullptr;
 
@@ -111,6 +114,297 @@ class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(ArcAppUninstallDialogViewBrowserTest);
 };
 
+class ArcAppPermissionDialogViewBrowserTest
+    : public ArcAppUninstallDialogViewBrowserTest {
+ public:
+  ArcAppPermissionDialogViewBrowserTest() : weak_ptr_factory_(this) {}
+  // InProcessBrowserTest:
+  ~ArcAppPermissionDialogViewBrowserTest() override = default;
+
+  void InstallExtraPackage(int id) {
+    mojom::AppInfo app;
+    app.name = base::StringPrintf("Fake App %d", id);
+    app.package_name = base::StringPrintf("fake.package.%d", id);
+    app.activity = base::StringPrintf("fake.app.%d.activity", id);
+    app.sticky = false;
+    instance()->SendAppAdded(app);
+
+    mojom::ArcPackageInfo package;
+    package.package_name = base::StringPrintf("fake.package.%d", id);
+    package.package_version = id;
+    package.last_backup_android_id = id;
+    package.last_backup_time = 0;
+    package.sync = false;
+    instance()->SendPackageAdded(package);
+  }
+
+  void set_accepted(bool accepted) { accepted_ = accepted; }
+
+  bool accepted() const { return accepted_; }
+
+  base::WeakPtr<ArcAppPermissionDialogViewBrowserTest> weak_ptr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
+  void RequestScanDeviceListPermission(
+      ArcUsbHostPermissionManager* arc_usb_permission_manager,
+      const std::string& package_name) {
+    arc_usb_permission_manager->RequestUsbScanDeviceListPermission(
+        package_name,
+        base::BindOnce(&ArcAppPermissionDialogViewBrowserTest::set_accepted,
+                       weak_ptr()));
+  }
+
+  void RequestAccessPermission(
+      ArcUsbHostPermissionManager* arc_usb_permission_manager,
+      const std::string& package_name) {
+    arc_usb_permission_manager->RequestUsbAccessPermission(
+        package_name, guid_, serial_number_, manufacturer_string_,
+        product_string_, vendor_id_, product_id_,
+        base::BindOnce(&ArcAppPermissionDialogViewBrowserTest::set_accepted,
+                       weak_ptr()));
+  }
+
+  const std::string& guid() const { return guid_; }
+  const base::string16& serial_number() const { return serial_number_; }
+  uint16_t vendor_id() const { return vendor_id_; }
+  uint16_t product_id() const { return product_id_; }
+
+ private:
+  // boolean used to verify dialog result if |set_accepted| is passed as
+  // callback. Used in USB basic permission flow test.
+  bool accepted_ = false;
+
+  // USB flow test related.
+  const std::string guid_ = "TestGuidXXXXXX";
+  const base::string16 serial_number_ = base::UTF8ToUTF16("TestSerialNumber");
+  const base::string16 manufacturer_string_ = base::UTF8ToUTF16("Factory");
+  const base::string16 product_string_ = base::UTF8ToUTF16("Product");
+  uint16_t vendor_id_ = 123;
+  uint16_t product_id_ = 456;
+
+  base::WeakPtrFactory<ArcAppPermissionDialogViewBrowserTest> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ArcAppPermissionDialogViewBrowserTest);
+};
+
+// Basic flow of requesting scan device list or access permission.
+IN_PROC_BROWSER_TEST_F(ArcAppPermissionDialogViewBrowserTest,
+                       ArcUsbPermissionBasicFlow) {
+  ArcUsbHostPermissionManager* arc_usb_permission_manager =
+      ArcUsbHostPermissionManager::GetForBrowserContext(profile());
+  DCHECK(arc_usb_permission_manager);
+
+  // Invalid package name. Requesut is automatically rejected.
+  const std::string invalid_package = "invalid_package";
+  RequestScanDeviceListPermission(arc_usb_permission_manager, invalid_package);
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+  EXPECT_FALSE(accepted());
+
+  const std::string package_name = "fake.package.0";
+
+  // Package sends scan devicelist request.
+  RequestScanDeviceListPermission(arc_usb_permission_manager, package_name);
+
+  // Dialog is shown. Call runs with false.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  // Accept the dialog.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+  // Result will apply when next time the package tries to request the
+  // permisson.
+  EXPECT_FALSE(accepted());
+  // Package tries to request scan device list permission again.
+  RequestScanDeviceListPermission(arc_usb_permission_manager, package_name);
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+  EXPECT_TRUE(accepted());
+
+  set_accepted(false);
+
+  // Package sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package_name);
+  // Dialog is shown.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  // Accept the dialog.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+  // Permission applies.
+  EXPECT_TRUE(accepted());
+  // Package sends same device access request again.
+  RequestAccessPermission(arc_usb_permission_manager, package_name);
+  // Dialog is not shown. Permission still applies.
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+  EXPECT_TRUE(accepted());
+}
+
+// Multiple requests are sent at same time and are processed in request order.
+// Previously accepted requests will be remembered.
+IN_PROC_BROWSER_TEST_F(ArcAppPermissionDialogViewBrowserTest,
+                       ArcUsbPermissionMultipleRequestFlow) {
+  ArcUsbHostPermissionManager* arc_usb_permission_manager =
+      ArcUsbHostPermissionManager::GetForBrowserContext(profile());
+  DCHECK(arc_usb_permission_manager);
+
+  InstallExtraPackage(1);
+  InstallExtraPackage(2);
+
+  const std::string package0 = "fake.package.0";
+  const std::string package1 = "fake.package.1";
+  const std::string package2 = "fake.package.2";
+
+  // Package0 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package0);
+
+  // Package1 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package1);
+
+  // Package0 sends device access request again.
+  RequestAccessPermission(arc_usb_permission_manager, package0);
+
+  // Package2 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package2);
+
+  // Dialog is shown.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  const auto& pending_requests =
+      arc_usb_permission_manager->GetPendingRequestsForTesting();
+  EXPECT_EQ(3u, pending_requests.size());
+  EXPECT_EQ(package1, pending_requests[0].package_name());
+  EXPECT_EQ(package0, pending_requests[1].package_name());
+  EXPECT_EQ(package2, pending_requests[2].package_name());
+
+  // Accept the dialog.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+
+  // Dialog is shown for the next request.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  EXPECT_EQ(2u, pending_requests.size());
+  EXPECT_EQ(package0, pending_requests[0].package_name());
+  EXPECT_EQ(package2, pending_requests[1].package_name());
+
+  // Accept the dialog.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+
+  // The 3rd request is the same to the first request so it's automatically
+  // confirmed. Dialog is shown for the final request.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  EXPECT_EQ(0u, pending_requests.size());
+
+  // Reject the dialog.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(false));
+  content::RunAllPendingInMessageLoop();
+
+  // All requests are handled. No dialog is shown.
+  EXPECT_FALSE(IsArcAppDialogViewAliveForTest());
+
+  // Checks permissions.
+  EXPECT_TRUE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package0, guid(), serial_number(), vendor_id(), product_id()));
+  EXPECT_TRUE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package1, guid(), serial_number(), vendor_id(), product_id()));
+  EXPECT_FALSE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package2, guid(), serial_number(), vendor_id(), product_id()));
+}
+
+// Package is removed when permission request is queued.
+IN_PROC_BROWSER_TEST_F(ArcAppPermissionDialogViewBrowserTest,
+                       ArcUsbPermissionPackageUninstallFlow) {
+  ArcUsbHostPermissionManager* arc_usb_permission_manager =
+      ArcUsbHostPermissionManager::GetForBrowserContext(profile());
+  DCHECK(arc_usb_permission_manager);
+
+  InstallExtraPackage(1);
+  InstallExtraPackage(2);
+
+  const std::string package0 = "fake.package.0";
+  const std::string package1 = "fake.package.1";
+  const std::string package2 = "fake.package.2";
+
+  // Package0 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package0);
+
+  // Package1 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package1);
+
+  // Package2 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package2);
+
+  // Dialog is shown.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  const auto& pending_requests =
+      arc_usb_permission_manager->GetPendingRequestsForTesting();
+  EXPECT_EQ(2u, pending_requests.size());
+  EXPECT_EQ(package1, pending_requests[0].package_name());
+  EXPECT_EQ(package2, pending_requests[1].package_name());
+
+  // Uninstall package0 and package2.
+  UninstallPackage(package0);
+  UninstallPackage(package2);
+  EXPECT_EQ(1u, pending_requests.size());
+  EXPECT_EQ(package1, pending_requests[0].package_name());
+
+  // Accept the dialog. But callback is ignored as package0 is uninstalled.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+
+  // Permision dialog for next request is shown.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  EXPECT_EQ(0u, pending_requests.size());
+
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+
+  EXPECT_FALSE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package0, guid(), serial_number(), vendor_id(), product_id()));
+  EXPECT_TRUE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package1, guid(), serial_number(), vendor_id(), product_id()));
+  EXPECT_FALSE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package2, guid(), serial_number(), vendor_id(), product_id()));
+}
+
+// Device is removed when permission request is queued.
+IN_PROC_BROWSER_TEST_F(ArcAppPermissionDialogViewBrowserTest,
+                       ArcUsbPermissionDeviceRemoveFlow) {
+  ArcUsbHostPermissionManager* arc_usb_permission_manager =
+      ArcUsbHostPermissionManager::GetForBrowserContext(profile());
+  DCHECK(arc_usb_permission_manager);
+
+  InstallExtraPackage(1);
+
+  const std::string package0 = "fake.package.0";
+  const std::string package1 = "fake.package.1";
+
+  // Package0 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package0);
+
+  // Package1 sends device access request.
+  RequestAccessPermission(arc_usb_permission_manager, package1);
+
+  // Dialog is shown.
+  EXPECT_TRUE(IsArcAppDialogViewAliveForTest());
+  const auto& pending_requests =
+      arc_usb_permission_manager->GetPendingRequestsForTesting();
+  EXPECT_EQ(1u, pending_requests.size());
+  EXPECT_EQ(package1, pending_requests[0].package_name());
+
+  // Device is removed.
+  arc_usb_permission_manager->DeviceRemoved(guid());
+  EXPECT_EQ(0u, pending_requests.size());
+
+  // Accept the dialog. But callback is ignored as device is removed.
+  EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
+  content::RunAllPendingInMessageLoop();
+
+  EXPECT_FALSE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package0, guid(), serial_number(), vendor_id(), product_id()));
+  EXPECT_FALSE(arc_usb_permission_manager->HasUsbAccessPermission(
+      package1, guid(), serial_number(), vendor_id(), product_id()));
+}
+
 // User confirms/cancels ARC app uninstall. Note that the shortcut is removed
 // when the app and the package are uninstalled since the shortcut and the app
 // share same package.
@@ -118,8 +412,8 @@ IN_PROC_BROWSER_TEST_F(ArcAppUninstallDialogViewBrowserTest,
                        UserConfirmsUninstall) {
   std::vector<std::string> app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 2u);
-  std::string package_name = base::StringPrintf("fake.package.%d", 0);
-  std::string app_activity = base::StringPrintf("fake.app.%d.activity", 0);
+  std::string package_name = "fake.package.0";
+  std::string app_activity = "fake.app.0.activity";
   std::string app_id =
       arc_app_list_pref()->GetAppId(package_name, app_activity);
 
@@ -175,8 +469,8 @@ IN_PROC_BROWSER_TEST_F(ArcAppUninstallDialogViewBrowserTest,
                        UserConfirmsUninstallShortcut) {
   std::vector<std::string> app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 2u);
-  std::string package_name = base::StringPrintf("fake.package.%d", 0);
-  std::string intent_uri = base::StringPrintf("Fake Shortcut uri %d", 0);
+  std::string package_name = "fake.package.0";
+  std::string intent_uri = "Fake Shortcut uri 0";
   std::string app_id = arc_app_list_pref()->GetAppId(package_name, intent_uri);
 
   AppListService* service = AppListService::Get();