bluetooth: Rename blink::mojom::WebBluetoothError

content/renderer/bluetooth/web_bluetooth_impl.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 "content/renderer/bluetooth/web_bluetooth_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDeviceInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristicInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTService.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebRequestDeviceOptions.h"
 
 namespace content {
 
 namespace {
 
-// Blink can't use non-blink mojo enums like blink::mojom::WebBluetoothError, so
-// we pass it as an int32 across the boundary.
-int32_t ToInt32(blink::mojom::WebBluetoothError error) {
-  return static_cast<int32_t>(error);
+// Blink can't use non-blink mojo enums like blink::mojom::WebBluetoothResult,
+// so we pass it as an int32 across the boundary.
+int32_t ToInt32(blink::mojom::WebBluetoothResult result) {
+  return static_cast<int32_t>(result);
 }
 
 }  // namespace
 
 WebBluetoothImpl::WebBluetoothImpl(shell::InterfaceProvider* remote_interfaces)
     : remote_interfaces_(remote_interfaces), binding_(this) {}
 
 WebBluetoothImpl::~WebBluetoothImpl() {
 }
 
@@ skipping 130 matching lines @@
   // resolved.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&WebBluetoothImpl::DispatchCharacteristicValueChanged,
                  base::Unretained(this), characteristic_instance_id,
                  value.PassStorage()));
 }
 
 void WebBluetoothImpl::OnRequestDeviceComplete(
     std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
-    const blink::mojom::WebBluetoothError error,
+    const blink::mojom::WebBluetoothResult result,
     blink::mojom::WebBluetoothDevicePtr device) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     blink::WebVector<blink::WebString> uuids(device->uuids.size());
     for (size_t i = 0; i < device->uuids.size(); ++i)
       uuids[i] = blink::WebString::fromUTF8(device->uuids[i]);
 
     callbacks->onSuccess(base::MakeUnique<blink::WebBluetoothDeviceInit>(
         blink::WebString::fromUTF8(device->id.str()),
         device->name.is_null() ? blink::WebString()
                                : blink::WebString::fromUTF8(device->name),
         uuids));
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::GattServerDisconnected(
     const WebBluetoothDeviceId& device_id) {
   auto device_iter = connected_devices_.find(device_id);
   if (device_iter != connected_devices_.end()) {
     // Remove device from the map before calling dispatchGattServerDisconnected
     // to avoid removing a device the gattserverdisconnected event handler might
     // have re-connected.
     blink::WebBluetoothDevice* device = device_iter->second;
     connected_devices_.erase(device_iter);
     device->dispatchGattServerDisconnected();
   }
 }
 
 void WebBluetoothImpl::OnConnectComplete(
     std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
         callbacks,
-    blink::mojom::WebBluetoothError error) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    blink::mojom::WebBluetoothResult result) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     callbacks->onSuccess();
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnGetPrimaryServicesComplete(
     const blink::WebString& device_id,
     std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
-    blink::mojom::WebBluetoothError error,
+    blink::mojom::WebBluetoothResult result,
     mojo::Array<blink::mojom::WebBluetoothRemoteGATTServicePtr> services) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     // TODO(dcheng): This WebVector should use smart pointers.
     blink::WebVector<blink::WebBluetoothRemoteGATTService*> promise_services(
         services.size());
 
     for (size_t i = 0; i < services.size(); i++) {
       promise_services[i] = new blink::WebBluetoothRemoteGATTService(
           blink::WebString::fromUTF8(services[i]->instance_id),
           blink::WebString::fromUTF8(services[i]->uuid), true /* isPrimary */,
           device_id);
     }
     callbacks->onSuccess(promise_services);
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnGetCharacteristicsComplete(
     const blink::WebString& service_instance_id,
     std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
-    blink::mojom::WebBluetoothError error,
+    blink::mojom::WebBluetoothResult result,
     mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
         characteristics) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     // TODO(dcheng): This WebVector should use smart pointers.
     blink::WebVector<blink::WebBluetoothRemoteGATTCharacteristicInit*>
         promise_characteristics(characteristics.size());
 
     for (size_t i = 0; i < characteristics.size(); i++) {
       promise_characteristics[i] =
           new blink::WebBluetoothRemoteGATTCharacteristicInit(
               service_instance_id,
               blink::WebString::fromUTF8(characteristics[i]->instance_id),
               blink::WebString::fromUTF8(characteristics[i]->uuid),
               characteristics[i]->properties);
     }
     callbacks->onSuccess(promise_characteristics);
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnReadValueComplete(
     std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
-    blink::mojom::WebBluetoothError error,
+    blink::mojom::WebBluetoothResult result,
     mojo::Array<uint8_t> value) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     callbacks->onSuccess(value.PassStorage());
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnWriteValueComplete(
     const blink::WebVector<uint8_t>& value,
     std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
-    blink::mojom::WebBluetoothError error) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    blink::mojom::WebBluetoothResult result) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     callbacks->onSuccess(value);
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnStartNotificationsComplete(
     std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
-    blink::mojom::WebBluetoothError error) {
-  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    blink::mojom::WebBluetoothResult result) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     callbacks->onSuccess();
   } else {
-    callbacks->onError(ToInt32(error));
+    callbacks->onError(ToInt32(result));
   }
 }
 
 void WebBluetoothImpl::OnStopNotificationsComplete(
     std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks) {
   callbacks->onSuccess();
 }
 
 void WebBluetoothImpl::DispatchCharacteristicValueChanged(
     const std::string& characteristic_instance_id,
@@ skipping 10 matching lines @@
     // Create an associated interface ptr and pass it to the WebBluetoothService
     // so that it can send us events without us prompting.
     blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo ptr_info;
     binding_.Bind(&ptr_info, web_bluetooth_service_.associated_group());
     web_bluetooth_service_->SetClient(std::move(ptr_info));
   }
   return *web_bluetooth_service_;
 }
 
 }  // namespace content