Remove outdated devices from Android device chooser

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
index a7751f75fab24955e4642b3ad2cca6efb4924bbe..60402603061bf0528cd2cf80cbff9c88ce5c2396 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
@@ -36,7 +36,6 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
     private long mNativeBluetoothAdapterAndroid;
     // mAdapter is final to ensure registerReceiver is followed by unregisterReceiver.
     private final Wrappers.BluetoothAdapterWrapper mAdapter;
-    private int mNumDiscoverySessions;
     private ScanCallback mScanCallback;
 
     // ---------------------------------------------------------------------------------------------
@@ -144,42 +143,13 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
     // Implements BluetoothAdapterAndroid::AddDiscoverySession.
     @CalledByNative
     private boolean addDiscoverySession() {

[ortuno, 2016/06/15 17:20:16]

This function seems less useful now. Make startScan public and call it from
BluetoothAdapterAndroid directly. Same with stopScan().

[perja, 2016/06/17 13:39:27]

Done.

-        if (!isPowered()) {
-            Log.d(TAG, "addDiscoverySession: Fails: !isPowered");
-            return false;
-        }
-
-        mNumDiscoverySessions++;
-        Log.d(TAG, "addDiscoverySession: Now %d sessions.", mNumDiscoverySessions);
-        if (mNumDiscoverySessions > 1) {
-            return true;
-        }
-
-        if (!startScan()) {
-            mNumDiscoverySessions--;
-            return false;
-        }
-        return true;
+        return startScan();
     }
 
     // Implements BluetoothAdapterAndroid::RemoveDiscoverySession.
     @CalledByNative
     private boolean removeDiscoverySession() {
-        if (mNumDiscoverySessions == 0) {
-            assert false;
-            Log.w(TAG, "removeDiscoverySession: No scan in progress.");
-            return false;
-        }
-
-        --mNumDiscoverySessions;
-
-        if (mNumDiscoverySessions == 0) {
-            Log.d(TAG, "removeDiscoverySession: Now 0 sessions. Stopping scan.");
-            return stopScan();
-        }
-
-        Log.d(TAG, "removeDiscoverySession: Now %d sessions.", mNumDiscoverySessions);
-        return true;
+        return stopScan();
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -291,7 +261,6 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
         public void onScanFailed(int errorCode) {
             Log.w(TAG, "onScanFailed: %d", errorCode);
             nativeOnScanFailed(mNativeBluetoothAdapterAndroid);
-            mNumDiscoverySessions = 0;
         }
     }