Refactor device::BluetoothGattXXX classes to split into remote/local.

device/bluetooth/bluetooth_remote_gatt_characteristic_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_remote_gatt_characteristic_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 34 matching lines @@
 
   return characteristic;
 }
 
 BluetoothRemoteGattCharacteristicAndroid::
     ~BluetoothRemoteGattCharacteristicAndroid() {
   Java_ChromeBluetoothRemoteGattCharacteristic_onBluetoothRemoteGattCharacteristicAndroidDestruction(
       AttachCurrentThread(), j_characteristic_.obj());
 
   if (pending_start_notify_calls_.size()) {
-    OnStartNotifySessionError(device::BluetoothGattService::GATT_ERROR_FAILED);
+    OnStartNotifySessionError(
+        device::BluetoothRemoteGattService::GATT_ERROR_FAILED);
   }
 }
 
 // static
 bool BluetoothRemoteGattCharacteristicAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(
       env);  // Generated in ChromeBluetoothRemoteGattCharacteristic_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothRemoteGattCharacteristicAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_characteristic_);
 }
 
 std::string BluetoothRemoteGattCharacteristicAndroid::GetIdentifier() const {
   return instance_id_;
 }
 
 BluetoothUUID BluetoothRemoteGattCharacteristicAndroid::GetUUID() const {
   return device::BluetoothUUID(ConvertJavaStringToUTF8(
       Java_ChromeBluetoothRemoteGattCharacteristic_getUUID(
           AttachCurrentThread(), j_characteristic_.obj())));
 }
 
-bool BluetoothRemoteGattCharacteristicAndroid::IsLocal() const {
-  return false;
-}
-
 const std::vector<uint8_t>& BluetoothRemoteGattCharacteristicAndroid::GetValue()
     const {
   return value_;
 }
 
-BluetoothGattService* BluetoothRemoteGattCharacteristicAndroid::GetService()
-    const {
+BluetoothRemoteGattService*
+BluetoothRemoteGattCharacteristicAndroid::GetService() const {
   return service_;
 }
 
-BluetoothGattCharacteristic::Properties
+BluetoothRemoteGattCharacteristic::Properties
 BluetoothRemoteGattCharacteristicAndroid::GetProperties() const {
   return Java_ChromeBluetoothRemoteGattCharacteristic_getProperties(
       AttachCurrentThread(), j_characteristic_.obj());
 }
 
-BluetoothGattCharacteristic::Permissions
+BluetoothRemoteGattCharacteristic::Permissions
 BluetoothRemoteGattCharacteristicAndroid::GetPermissions() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 bool BluetoothRemoteGattCharacteristicAndroid::IsNotifying() const {
   NOTIMPLEMENTED();
   return false;
 }
 
-std::vector<BluetoothGattDescriptor*>
+std::vector<BluetoothRemoteGattDescriptor*>
 BluetoothRemoteGattCharacteristicAndroid::GetDescriptors() const {
   EnsureDescriptorsCreated();
-  std::vector<BluetoothGattDescriptor*> descriptors;
+  std::vector<BluetoothRemoteGattDescriptor*> descriptors;
   for (const auto& map_iter : descriptors_)
     descriptors.push_back(map_iter.second);
   return descriptors;
 }
 
-BluetoothGattDescriptor*
+BluetoothRemoteGattDescriptor*
 BluetoothRemoteGattCharacteristicAndroid::GetDescriptor(
     const std::string& identifier) const {
   EnsureDescriptorsCreated();
   const auto& iter = descriptors_.find(identifier);
   if (iter == descriptors_.end())
     return nullptr;
   return iter->second;
 }
 
-bool BluetoothRemoteGattCharacteristicAndroid::AddDescriptor(
-    BluetoothGattDescriptor* descriptor) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool BluetoothRemoteGattCharacteristicAndroid::UpdateValue(
-    const std::vector<uint8_t>& value) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
 void BluetoothRemoteGattCharacteristicAndroid::StartNotifySession(
     const NotifySessionCallback& callback,
     const ErrorCallback& error_callback) {
   if (!pending_start_notify_calls_.empty()) {
     pending_start_notify_calls_.push_back(
         std::make_pair(callback, error_callback));
     return;
   }
 
   Properties properties = GetProperties();
 
   bool hasNotify = properties & PROPERTY_NOTIFY;
   bool hasIndicate = properties & PROPERTY_INDICATE;
 
   if (!hasNotify && !hasIndicate) {
     LOG(ERROR) << "Characteristic needs NOTIFY or INDICATE";
     base::MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(error_callback,
-                              BluetoothGattService::GATT_ERROR_NOT_SUPPORTED));
+        FROM_HERE,
+        base::Bind(error_callback,
+                   BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED));
     return;
   }
 
-  std::vector<BluetoothGattDescriptor*> ccc_descriptor = GetDescriptorsByUUID(
-      BluetoothGattDescriptor::ClientCharacteristicConfigurationUuid());
+  std::vector<BluetoothRemoteGattDescriptor*> ccc_descriptor =
+      GetDescriptorsByUUID(BluetoothRemoteGattDescriptor::
+                               ClientCharacteristicConfigurationUuid());
 
   if (ccc_descriptor.size() != 1u) {
     LOG(ERROR) << "Found " << ccc_descriptor.size()
                << " client characteristic configuration descriptors.";
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(error_callback,
                    (ccc_descriptor.size() == 0)
-                       ? BluetoothGattService::GATT_ERROR_NOT_SUPPORTED
-                       : BluetoothGattService::GATT_ERROR_FAILED));
+                       ? BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED
+                       : BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_setCharacteristicNotification(
           AttachCurrentThread(), j_characteristic_.obj(), true)) {
     LOG(ERROR) << "Error enabling characteristic notification";
     base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(error_callback, BluetoothGattService::GATT_ERROR_FAILED));
+        FROM_HERE, base::Bind(error_callback,
+                              BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   std::vector<uint8_t> value(2);
   value[0] = hasNotify ? 1 : 2;
 
   pending_start_notify_calls_.push_back(
       std::make_pair(callback, error_callback));
   ccc_descriptor[0]->WriteRemoteDescriptor(
       value, base::Bind(&BluetoothRemoteGattCharacteristicAndroid::
                             OnStartNotifySessionSuccess,
                         base::Unretained(this)),
       base::Bind(
           &BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionError,
           base::Unretained(this)));
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::ReadRemoteCharacteristic(
     const ValueCallback& callback,
     const ErrorCallback& error_callback) {
   if (read_pending_ || write_pending_) {
     base::MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(error_callback,
-                              BluetoothGattService::GATT_ERROR_IN_PROGRESS));
+        FROM_HERE,
+        base::Bind(error_callback,
+                   BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
     return;
   }
 
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_readRemoteCharacteristic(
           AttachCurrentThread(), j_characteristic_.obj())) {
     base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(error_callback, BluetoothGattService::GATT_ERROR_FAILED));
+        FROM_HERE, base::Bind(error_callback,
+                              BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   read_pending_ = true;
   read_callback_ = callback;
   read_error_callback_ = error_callback;
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::WriteRemoteCharacteristic(
     const std::vector<uint8_t>& new_value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   if (read_pending_ || write_pending_) {
     base::MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(error_callback,
-                              BluetoothGattService::GATT_ERROR_IN_PROGRESS));
+        FROM_HERE,
+        base::Bind(error_callback,
+                   BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
     return;
   }
 
   JNIEnv* env = AttachCurrentThread();
   if (!Java_ChromeBluetoothRemoteGattCharacteristic_writeRemoteCharacteristic(
           env, j_characteristic_.obj(),
           base::android::ToJavaByteArray(env, new_value).obj())) {
     base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(error_callback, BluetoothGattService::GATT_ERROR_FAILED));
+        FROM_HERE, base::Bind(error_callback,
+                              BluetoothRemoteGattService::GATT_ERROR_FAILED));
     return;
   }
 
   write_pending_ = true;
   write_callback_ = callback;
   write_error_callback_ = error_callback;
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnChanged(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     const JavaParamRef<jbyteArray>& value) {
   base::android::JavaByteArrayToByteVector(env, value, &value_);
   adapter_->NotifyGattCharacteristicValueChanged(this, value_);
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionSuccess() {
   std::vector<PendingStartNotifyCall> reentrant_safe_callbacks;
   reentrant_safe_callbacks.swap(pending_start_notify_calls_);
 
   for (const auto& callback_pair : reentrant_safe_callbacks) {
     std::unique_ptr<device::BluetoothGattNotifySession> notify_session(
         new BluetoothGattNotifySessionAndroid(instance_id_));
     callback_pair.first.Run(std::move(notify_session));
   }
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnStartNotifySessionError(
-    BluetoothGattService::GattErrorCode error) {
+    BluetoothRemoteGattService::GattErrorCode error) {
   std::vector<PendingStartNotifyCall> reentrant_safe_callbacks;
   reentrant_safe_callbacks.swap(pending_start_notify_calls_);
 
   for (auto const& callback_pair : reentrant_safe_callbacks) {
     callback_pair.second.Run(error);
   }
 }
 
 void BluetoothRemoteGattCharacteristicAndroid::OnRead(
     JNIEnv* env,
@@ skipping 70 matching lines @@
 void BluetoothRemoteGattCharacteristicAndroid::EnsureDescriptorsCreated()
     const {
   if (!descriptors_.empty())
     return;
 
   Java_ChromeBluetoothRemoteGattCharacteristic_createDescriptors(
       AttachCurrentThread(), j_characteristic_.obj());
 }
 
 }  // namespace device