Revert of Clear the BLE services list on disconnect.

device/bluetooth/bluetooth_device_android.cc

 // Copyright 2015 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.
 
 #include "device/bluetooth/bluetooth_device_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 192 matching lines @@
 
 void BluetoothDeviceAndroid::OnConnectionStateChange(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     int32_t status,
     bool connected) {
   gatt_connected_ = connected;
   if (gatt_connected_) {
     DidConnectGatt();
   } else {
-    gatt_services_.clear();
-    SetGattServicesDiscoveryComplete(false);
-
     switch (status) {   // Constants are from android.bluetooth.BluetoothGatt.
       case 0x0000008f:  // GATT_CONNECTION_CONGESTED
         return DidFailToConnectGatt(ERROR_CONNECTION_CONGESTED);
       case 0x00000101:  // GATT_FAILURE
         return DidFailToConnectGatt(ERROR_FAILED);
       case 0x00000005:  // GATT_INSUFFICIENT_AUTHENTICATION
         return DidFailToConnectGatt(ERROR_AUTH_FAILED);
       case 0x0000000f:  // GATT_INSUFFICIENT_ENCRYPTION
         return DidFailToConnectGatt(ERROR_INSUFFICIENT_ENCRYPTION);
       case 0x0000000d:  // GATT_INVALID_ATTRIBUTE_LENGTH
@@ skipping 11 matching lines @@
       default:
         VLOG(1) << "Unhandled status: " << status;
         return DidFailToConnectGatt(ERROR_UNKNOWN);
     }
   }
 }
 
 void BluetoothDeviceAndroid::OnGattServicesDiscovered(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller) {
-  SetGattServicesDiscoveryComplete(true);
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, GetAdapter()->GetObservers(),
                     GattServicesDiscovered(GetAdapter(), this));
 }
 
 void BluetoothDeviceAndroid::CreateGattRemoteService(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>&
         bluetooth_gatt_service_wrapper) {  // BluetoothGattServiceWrapper
@@ skipping 26 matching lines @@
       AttachCurrentThread(), j_device_.obj(),
       base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
                                             j_device_.obj());
 }
 
 }  // namespace device