WebUsb Android chooser UI

chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser;
 
 import android.Manifest;
 import android.app.Dialog;
 import android.content.pm.PackageManager;
 import android.test.MoreAsserts;
@@ skipping 130 matching lines @@
 
     /**
      * The messages include <link> ... </link> sections that are used to create
      * clickable spans. For testing the messages, this function returns the raw
      * string without the tags.
      */
     private static String removeLinkTags(String message) {
         return message.replaceAll("</?link>", "");
     }
 
+    /**
+     * The messages include <link1> ... </link1>, <link2> ... </link2> sections
+     * that are used to create clickable spans. For testing the messages, this
+     * function returns the raw string without the tags.
+     */
+    private static String removeMultipleLinkTags(String message) {

[newt (away), 2016/03/17 01:53:20]

Why not combine this into the method above?

[juncai, 2016/03/17 18:21:35]

Done.

+        return message.replaceAll("</?link1>", "").replaceAll("</?link2>", "");
+    }
+
     @SmallTest
     public void testCancel() throws InterruptedException {
         ItemChooserDialog itemChooser = mChooserDialog.mItemChooserDialog;
         Dialog dialog = itemChooser.getDialogForTesting();
         assertTrue(dialog.isShowing());
 
         TextViewWithClickableSpans statusView =
                 (TextViewWithClickableSpans) dialog.findViewById(R.id.status);
         final ListView items = (ListView) dialog.findViewById(R.id.items);
         final Button button = (Button) dialog.findViewById(R.id.positive);
@@ skipping 34 matching lines @@
             public void run() {
                 mChooserDialog.addDevice("id-1", "Name 1");
                 mChooserDialog.addDevice("id-2", "Name 2");
             }
         });
 
         // After adding items to the dialog, the help message should be showing,
         // the progress spinner should disappear, the Commit button should still
         // be disabled (since nothing's selected), and the list view should
         // show.
-        assertEquals(removeLinkTags(getActivity().getString(R.string.bluetooth_not_seeing_it)),
+        assertEquals(removeMultipleLinkTags(getActivity().getString(
+                R.string.bluetooth_not_seeing_it_idle_some_found)),
                 statusView.getText().toString());
         assertFalse(button.isEnabled());
         assertEquals(View.VISIBLE, items.getVisibility());
         assertEquals(View.GONE, progress.getVisibility());
 
         selectItem(mChooserDialog, 2);
 
         assertEquals(
                 BluetoothChooserDialog.DIALOG_FINISHED_SELECTED, mChooserDialog.mFinishedEventType);
         assertEquals("id-2", mChooserDialog.mFinishedDeviceId);
@@ skipping 86 matching lines @@
         @Override
         public void requestPermissions(String[] permissions, PermissionCallback callback) {
             mPermissionsRequested = permissions;
             if (permissions.length == 1
                     && permissions[0].equals(Manifest.permission.ACCESS_COARSE_LOCATION)) {
                 mCallback = callback;
             }
         }
     }
 }