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

device/bluetooth/bluetooth_remote_gatt_service_android.cc

 // Copyright 2014 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_service_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 37 matching lines @@
   return RegisterNativesImpl(
       env);  // Generated in ChromeBluetoothRemoteGattService_jni.h
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 BluetoothRemoteGattServiceAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(j_service_);
 }
 
 // static
-BluetoothGattService::GattErrorCode
+BluetoothRemoteGattService::GattErrorCode
 BluetoothRemoteGattServiceAndroid::GetGattErrorCode(int bluetooth_gatt_code) {
   DCHECK(bluetooth_gatt_code != 0) << "Only errors valid. 0 == GATT_SUCCESS.";
 
-  // TODO(scheib) Create new BluetoothGattService::GattErrorCode enums for
+  // TODO(scheib) Create new BluetoothRemoteGattService::GattErrorCode enums for
   // android values not yet represented. http://crbug.com/548498
   switch (bluetooth_gatt_code) {  // android.bluetooth.BluetoothGatt values:
     case 0x00000101:              // GATT_FAILURE
       return GATT_ERROR_FAILED;
     case 0x0000000d:  // GATT_INVALID_ATTRIBUTE_LENGTH
       return GATT_ERROR_INVALID_LENGTH;
     case 0x00000002:  // GATT_READ_NOT_PERMITTED
       return GATT_ERROR_NOT_PERMITTED;
     case 0x00000006:  // GATT_REQUEST_NOT_SUPPORTED
       return GATT_ERROR_NOT_SUPPORTED;
     case 0x00000003:  // GATT_WRITE_NOT_PERMITTED
       return GATT_ERROR_NOT_PERMITTED;
     default:
       VLOG(1) << "Unhandled status: " << bluetooth_gatt_code;
-      return BluetoothGattService::GATT_ERROR_UNKNOWN;
+      return BluetoothRemoteGattService::GATT_ERROR_UNKNOWN;
   }
 }
 
 // static
 int BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(
-    BluetoothGattService::GattErrorCode error_code) {
-  // TODO(scheib) Create new BluetoothGattService::GattErrorCode enums for
+    BluetoothRemoteGattService::GattErrorCode error_code) {
+  // TODO(scheib) Create new BluetoothRemoteGattService::GattErrorCode enums for
   // android values not yet represented. http://crbug.com/548498
   switch (error_code) {  // Return values from android.bluetooth.BluetoothGatt:
     case GATT_ERROR_UNKNOWN:
       return 0x00000101;  // GATT_FAILURE. No good match.
     case GATT_ERROR_FAILED:
       return 0x00000101;  // GATT_FAILURE
     case GATT_ERROR_IN_PROGRESS:
       return 0x00000101;  // GATT_FAILURE. No good match.
     case GATT_ERROR_INVALID_LENGTH:
       return 0x0000000d;  // GATT_INVALID_ATTRIBUTE_LENGTH
@@ skipping 16 matching lines @@
 std::string BluetoothRemoteGattServiceAndroid::GetIdentifier() const {
   return instance_id_;
 }
 
 device::BluetoothUUID BluetoothRemoteGattServiceAndroid::GetUUID() const {
   return device::BluetoothUUID(
       ConvertJavaStringToUTF8(Java_ChromeBluetoothRemoteGattService_getUUID(
           AttachCurrentThread(), j_service_.obj())));
 }
 
-bool BluetoothRemoteGattServiceAndroid::IsLocal() const {
-  return false;
-}
-
 bool BluetoothRemoteGattServiceAndroid::IsPrimary() const {
   NOTIMPLEMENTED();
   return true;
 }
 
 device::BluetoothDevice* BluetoothRemoteGattServiceAndroid::GetDevice() const {
   return device_;
 }
 
-std::vector<device::BluetoothGattCharacteristic*>
+std::vector<device::BluetoothRemoteGattCharacteristic*>
 BluetoothRemoteGattServiceAndroid::GetCharacteristics() const {
   EnsureCharacteristicsCreated();
-  std::vector<device::BluetoothGattCharacteristic*> characteristics;
+  std::vector<device::BluetoothRemoteGattCharacteristic*> characteristics;
   for (const auto& map_iter : characteristics_)
     characteristics.push_back(map_iter.second);
   return characteristics;
 }
 
-std::vector<device::BluetoothGattService*>
+std::vector<device::BluetoothRemoteGattService*>
 BluetoothRemoteGattServiceAndroid::GetIncludedServices() const {
   NOTIMPLEMENTED();
-  return std::vector<device::BluetoothGattService*>();
+  return std::vector<device::BluetoothRemoteGattService*>();
 }
 
-device::BluetoothGattCharacteristic*
+device::BluetoothRemoteGattCharacteristic*
 BluetoothRemoteGattServiceAndroid::GetCharacteristic(
     const std::string& identifier) const {
   EnsureCharacteristicsCreated();
   const auto& iter = characteristics_.find(identifier);
   if (iter == characteristics_.end())
     return nullptr;
   return iter->second;
 }
 
-bool BluetoothRemoteGattServiceAndroid::AddCharacteristic(
-    device::BluetoothGattCharacteristic* characteristic) {
-  return false;
-}
-
-bool BluetoothRemoteGattServiceAndroid::AddIncludedService(
-    device::BluetoothGattService* service) {
-  return false;
-}
-
-void BluetoothRemoteGattServiceAndroid::Register(
-    const base::Closure& callback,
-    const ErrorCallback& error_callback) {
-  error_callback.Run(GATT_ERROR_NOT_SUPPORTED);
-}
-
-void BluetoothRemoteGattServiceAndroid::Unregister(
-    const base::Closure& callback,
-    const ErrorCallback& error_callback) {
-  error_callback.Run(GATT_ERROR_NOT_SUPPORTED);
-}
-
 void BluetoothRemoteGattServiceAndroid::CreateGattRemoteCharacteristic(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& instance_id,
     const JavaParamRef<jobject>& /* BluetoothGattCharacteristicWrapper */
     bluetooth_gatt_characteristic_wrapper,
     const JavaParamRef<
         jobject>& /* ChromeBluetoothDevice */ chrome_bluetooth_device) {
   std::string instance_id_string =
       base::android::ConvertJavaStringToUTF8(env, instance_id);
@@ skipping 16 matching lines @@
 void BluetoothRemoteGattServiceAndroid::EnsureCharacteristicsCreated() const {
   if (!characteristics_.empty())
     return;
 
   // Java call
   Java_ChromeBluetoothRemoteGattService_createCharacteristics(
       AttachCurrentThread(), j_service_.obj());
 }
 
 }  // namespace device