Move enum BluetoothDevice::DeviceType out of BluetoothDevice class.

device/bluetooth/bluez/bluetooth_bluez_unittest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 17 matching lines @@
 #include "device/bluetooth/dbus/fake_bluetooth_device_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_service_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_input_client.h"
 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothAdapterFactory;
 using device::BluetoothDevice;
+using device::BluetoothDeviceType;
 using device::BluetoothDiscoveryFilter;
 using device::BluetoothDiscoverySession;
 using device::BluetoothUUID;
 using device::TestBluetoothAdapterObserver;
 
 namespace bluez {
 
 namespace {
 
 // Callback for BluetoothDevice::GetConnectionInfo() that simply saves the
@@ skipping 2091 matching lines @@
   int idx = GetDeviceIndexByAddress(
       devices, bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_NE(-1, idx);
   ASSERT_EQ(bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress,
             devices[idx]->GetAddress());
 
   // Verify the other device properties.
   EXPECT_EQ(
       base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceAlias),
       devices[idx]->GetNameForDisplay());
-  EXPECT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::COMPUTER, devices[idx]->GetDeviceType());
   EXPECT_TRUE(devices[idx]->IsPaired());
   EXPECT_FALSE(devices[idx]->IsConnected());
   EXPECT_FALSE(devices[idx]->IsConnecting());
 
   // Non HID devices are always connectable.
   EXPECT_TRUE(devices[idx]->IsConnectable());
 
   BluetoothDevice::UUIDSet uuids = devices[idx]->GetUUIDs();
   EXPECT_EQ(2U, uuids.size());
   EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1800")));
   EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1801")));
 
   EXPECT_EQ(BluetoothDevice::VENDOR_ID_USB, devices[idx]->GetVendorIDSource());
   EXPECT_EQ(0x05ac, devices[idx]->GetVendorID());
   EXPECT_EQ(0x030d, devices[idx]->GetProductID());
   EXPECT_EQ(0x0306, devices[idx]->GetDeviceID());
 }
 
 TEST_F(BluetoothBlueZTest, DeviceClassChanged) {
   // Simulate a change of class of a device, as sometimes occurs
   // during discovery.
   GetAdapter();
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
   int idx = GetDeviceIndexByAddress(
       devices, bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_NE(-1, idx);
-  ASSERT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
+  ASSERT_EQ(BluetoothDeviceType::COMPUTER, devices[idx]->GetDeviceType());
 
   // Install an observer; expect the DeviceChanged method to be called when
   // we change the class of the device.
   TestBluetoothAdapterObserver observer(adapter_);
 
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
 
   properties->bluetooth_class.ReplaceValue(0x002580);
 
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
 
-  EXPECT_EQ(BluetoothDevice::DEVICE_MOUSE, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::MOUSE, devices[idx]->GetDeviceType());
 }
 
 TEST_F(BluetoothBlueZTest, DeviceAppearance) {
   // Simulate a device with appearance.
   GetAdapter();
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
   int idx = GetDeviceIndexByAddress(
       devices, bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_NE(-1, idx);
-  ASSERT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
+  ASSERT_EQ(BluetoothDeviceType::COMPUTER, devices[idx]->GetDeviceType());
 
   // Install an observer; expect the DeviceChanged method to be called when
   // we change the appearance of the device.
   TestBluetoothAdapterObserver observer(adapter_);
 
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
 
   // Let the device come without bluetooth_class.
@@ skipping 35 matching lines @@
 TEST_F(BluetoothBlueZTest, DeviceTypebyAppearanceNotBluetoothClass) {
   // Test device type of a device with appearance but without bluetooth class.
   GetAdapter();
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
   int idx = GetDeviceIndexByAddress(
       devices, bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_NE(-1, idx);
-  ASSERT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
+  ASSERT_EQ(BluetoothDeviceType::COMPUTER, devices[idx]->GetDeviceType());
 
   // Install an observer; expect the DeviceChanged method to be called when
   // we change the appearance of the device.
   TestBluetoothAdapterObserver observer(adapter_);
 
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
 
   // Let the device come without bluetooth_class.
   properties->bluetooth_class.ReplaceValue(0);  // DeviceChanged method called
   properties->appearance.ReplaceValue(0);       // DeviceChanged method called
-  EXPECT_EQ(BluetoothDevice::DEVICE_UNKNOWN, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::UNKNOWN, devices[idx]->GetDeviceType());
   EXPECT_EQ(2, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
 
   // Set the device appearance as keyboard.
   properties->appearance.ReplaceValue(961);  // DeviceChanged method called
   properties->appearance.set_valid(true);
-  EXPECT_EQ(BluetoothDevice::DEVICE_KEYBOARD, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::KEYBOARD, devices[idx]->GetDeviceType());
   EXPECT_EQ(3, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
   // When discovery is over, the value should be invalidated.
   properties->appearance.set_valid(false);
   // DeviceChanged method called by NotifyPropertyChanged()
   properties->NotifyPropertyChanged(properties->appearance.name());
   EXPECT_EQ(4, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
-  EXPECT_EQ(BluetoothDevice::DEVICE_UNKNOWN, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::UNKNOWN, devices[idx]->GetDeviceType());
 
   // Change the device appearance to mouse.
   properties->appearance.ReplaceValue(962);  // DeviceChanged method called
   properties->appearance.set_valid(true);
-  EXPECT_EQ(BluetoothDevice::DEVICE_MOUSE, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::MOUSE, devices[idx]->GetDeviceType());
   EXPECT_EQ(5, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
   // When discovery is over, the value should be invalidated.
   properties->appearance.set_valid(false);
   // DeviceChanged method called by NotifyPropertyChanged()
   properties->NotifyPropertyChanged(properties->appearance.name());
   EXPECT_EQ(6, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
-  EXPECT_EQ(BluetoothDevice::DEVICE_UNKNOWN, devices[idx]->GetDeviceType());
+  EXPECT_EQ(BluetoothDeviceType::UNKNOWN, devices[idx]->GetDeviceType());
 }
 
 TEST_F(BluetoothBlueZTest, DeviceNameChanged) {
   // Simulate a change of name of a device.
   GetAdapter();
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
   int idx = GetDeviceIndexByAddress(
@@ skipping 2163 matching lines @@
   adapter_->Shutdown();
   adapter_bluez->OnStopDiscoveryError(GetDiscoveryErrorCallback(), "", "");
 
   // 1 error reported to RemoveDiscoverySession because of OnStopDiscoveryError,
   // and kNumberOfDiscoverySessions errors queued with AddDiscoverySession.
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1 + kNumberOfDiscoverySessions, error_callback_count_);
 }
 
 }  // namespace bluez