Move enum BluetoothDevice::DeviceType out of BluetoothDevice class.

extensions/browser/api/bluetooth/bluetooth_api_utils.cc

 // Copyright (c) 2012 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 "extensions/browser/api/bluetooth/bluetooth_api_utils.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "extensions/common/api/bluetooth.h"
 
 namespace bluetooth = extensions::api::bluetooth;
 
 using device::BluetoothDevice;
+using device::BluetoothDeviceType;
 using bluetooth::VendorIdSource;
 
 namespace {
 
 bool ConvertVendorIDSourceToApi(const BluetoothDevice::VendorIDSource& input,
                                 bluetooth::VendorIdSource* output) {
   switch (input) {
     case BluetoothDevice::VENDOR_ID_UNKNOWN:
       *output = bluetooth::VENDOR_ID_SOURCE_NONE;
       return true;
     case BluetoothDevice::VENDOR_ID_BLUETOOTH:
       *output = bluetooth::VENDOR_ID_SOURCE_BLUETOOTH;
       return true;
     case BluetoothDevice::VENDOR_ID_USB:
       *output = bluetooth::VENDOR_ID_SOURCE_USB;
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
-bool ConvertDeviceTypeToApi(const BluetoothDevice::DeviceType& input,
+bool ConvertDeviceTypeToApi(const BluetoothDeviceType& input,
                             bluetooth::DeviceType* output) {
   switch (input) {
-    case BluetoothDevice::DEVICE_UNKNOWN:
+    case BluetoothDeviceType::UNKNOWN:
       *output = bluetooth::DEVICE_TYPE_NONE;
       return true;
-    case BluetoothDevice::DEVICE_COMPUTER:
+    case BluetoothDeviceType::COMPUTER:
       *output = bluetooth::DEVICE_TYPE_COMPUTER;
       return true;
-    case BluetoothDevice::DEVICE_PHONE:
+    case BluetoothDeviceType::PHONE:
       *output = bluetooth::DEVICE_TYPE_PHONE;
       return true;
-    case BluetoothDevice::DEVICE_MODEM:
+    case BluetoothDeviceType::MODEM:
       *output = bluetooth::DEVICE_TYPE_MODEM;
       return true;
-    case BluetoothDevice::DEVICE_AUDIO:
+    case BluetoothDeviceType::AUDIO:
       *output = bluetooth::DEVICE_TYPE_AUDIO;
       return true;
-    case BluetoothDevice::DEVICE_CAR_AUDIO:
+    case BluetoothDeviceType::CAR_AUDIO:
       *output = bluetooth::DEVICE_TYPE_CARAUDIO;
       return true;
-    case BluetoothDevice::DEVICE_VIDEO:
+    case BluetoothDeviceType::VIDEO:
       *output = bluetooth::DEVICE_TYPE_VIDEO;
       return true;
-    case BluetoothDevice::DEVICE_PERIPHERAL:
+    case BluetoothDeviceType::PERIPHERAL:
       *output = bluetooth::DEVICE_TYPE_PERIPHERAL;
       return true;
-    case BluetoothDevice::DEVICE_JOYSTICK:
+    case BluetoothDeviceType::JOYSTICK:
       *output = bluetooth::DEVICE_TYPE_JOYSTICK;
       return true;
-    case BluetoothDevice::DEVICE_GAMEPAD:
+    case BluetoothDeviceType::GAMEPAD:
       *output = bluetooth::DEVICE_TYPE_GAMEPAD;
       return true;
-    case BluetoothDevice::DEVICE_KEYBOARD:
+    case BluetoothDeviceType::KEYBOARD:
       *output = bluetooth::DEVICE_TYPE_KEYBOARD;
       return true;
-    case BluetoothDevice::DEVICE_MOUSE:
+    case BluetoothDeviceType::MOUSE:
       *output = bluetooth::DEVICE_TYPE_MOUSE;
       return true;
-    case BluetoothDevice::DEVICE_TABLET:
+    case BluetoothDeviceType::TABLET:
       *output = bluetooth::DEVICE_TYPE_TABLET;
       return true;
-    case BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO:
+    case BluetoothDeviceType::KEYBOARD_MOUSE_COMBO:
       *output = bluetooth::DEVICE_TYPE_KEYBOARDMOUSECOMBO;
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace
 
 namespace extensions {
@@ skipping 47 matching lines @@
   out->discovering = adapter.IsDiscovering();
   out->available = adapter.IsPresent();
   out->powered = adapter.IsPowered();
   out->name = adapter.GetName();
   out->address = adapter.GetAddress();
 }
 
 }  // namespace bluetooth
 }  // namespace api
 }  // namespace extensions