bluetooth: Refactor how we update based on Advertising Data

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"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
 #include "jni/ChromeBluetoothDevice_jni.h"
 
 using base::android::AttachCurrentThread;
-using base::android::AppendJavaStringArrayToStringVector;
 using base::android::JavaParamRef;
 
 namespace device {
 namespace {
 void RecordConnectionSuccessResult(int32_t status) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Bluetooth.Android.GATTConnection.Success.Result",
                               status);
 }
 void RecordConnectionFailureResult(int32_t status) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Bluetooth.Android.GATTConnection.Failure.Result",
@@ skipping 15 matching lines @@
       bluetooth_device_wrapper));
 
   return device;
 }
 
 BluetoothDeviceAndroid::~BluetoothDeviceAndroid() {
   Java_ChromeBluetoothDevice_onBluetoothDeviceAndroidDestruction(
       AttachCurrentThread(), j_device_);
 }
 
-void BluetoothDeviceAndroid::UpdateAdvertisedUUIDs(
-    jobjectArray advertised_uuids) {
-  JNIEnv* env = AttachCurrentThread();
-  std::vector<std::string> uuid_strings;
-  AppendJavaStringArrayToStringVector(env, advertised_uuids, &uuid_strings);
-
-  advertised_uuids_ = UUIDList(uuid_strings.begin(), uuid_strings.end());
-}
-
 // static
 bool BluetoothDeviceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in ChromeBluetoothDevice_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothDeviceAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_device_);
 }
 
@@ skipping 161 matching lines @@
     // We assume that if there are any pending connection callbacks there
     // was a failed connection attempt.
     RecordConnectionFailureResult(status);
     // TODO(ortuno): Return an error code based on |status|
     // http://crbug.com/578191
     DidFailToConnectGatt(ERROR_FAILED);
   } else {
     // Otherwise an existing connection was terminated.
     RecordConnectionTerminatedResult(status);
     gatt_services_.clear();
-    service_uuids_.clear();
+    device_uuids_.ClearServiceUUIDs();
     SetGattServicesDiscoveryComplete(false);
     DidDisconnectGatt();
   }
 }
 
 void BluetoothDeviceAndroid::OnGattServicesDiscovered(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller) {
-  UpdateServiceUUIDs();
+  device_uuids_.ReplaceServiceUUIDs(gatt_services_);
   SetGattServicesDiscoveryComplete(true);
   adapter_->NotifyGattServicesDiscovered(this);
+  adapter_->NotifyDeviceChanged(this);
 }
 
 void BluetoothDeviceAndroid::CreateGattRemoteService(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>&
         bluetooth_gatt_service_wrapper) {  // BluetoothGattServiceWrapper
   std::string instance_id_string =
       base::android::ConvertJavaStringToUTF8(env, instance_id);
@@ skipping 17 matching lines @@
 void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
   Java_ChromeBluetoothDevice_createGattConnectionImpl(
       AttachCurrentThread(), j_device_, base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(), j_device_);
 }
 
 }  // namespace device