Restore BLUETOOTH_LOG and convert bluetooth_adapter_bluez to use it

components/device_event_log/device_event_log.h

 // 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.
 
 #ifndef COMPONENTS_DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_H_
 #define COMPONENTS_DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_H_
 
 #include <stddef.h>
 
 #include <cstring>
@@ skipping 12 matching lines @@
 //
 // The following values should be used for |level| in these macros:
 //  ERROR Unexpected events, or device level failures. Use sparingly.
 //  USER  Events initiated directly by a user (or Chrome) action.
 //  EVENT Default event type.
 //  DEBUG Debugging details that are usually not interesting.
 //
 // Examples:
 //  NET_LOG(EVENT) << "NetworkState Changed " << name << ": " << state;
 //  POWER_LOG(USER) << "Suspend requested";
+//
+// See also the README.md in this directory.
 
 #define NET_LOG(level)                             \
   DEVICE_LOG(::device_event_log::LOG_TYPE_NETWORK, \
              ::device_event_log::LOG_LEVEL_##level)
 #define POWER_LOG(level)                         \
   DEVICE_LOG(::device_event_log::LOG_TYPE_POWER, \
              ::device_event_log::LOG_LEVEL_##level)
 #define LOGIN_LOG(level)                         \
   DEVICE_LOG(::device_event_log::LOG_TYPE_LOGIN, \
              ::device_event_log::LOG_LEVEL_##level)
+#define BLUETOOTH_LOG(level)                         \
+  DEVICE_LOG(::device_event_log::LOG_TYPE_BLUETOOTH, \
+             ::device_event_log::LOG_LEVEL_##level)
 #define USB_LOG(level)                         \
   DEVICE_LOG(::device_event_log::LOG_TYPE_USB, \
              ::device_event_log::LOG_LEVEL_##level)
 #define USB_PLOG(level)                         \
   DEVICE_PLOG(::device_event_log::LOG_TYPE_USB, \
               ::device_event_log::LOG_LEVEL_##level)
 #define HID_LOG(level)                         \
   DEVICE_LOG(::device_event_log::LOG_TYPE_HID, \
              ::device_event_log::LOG_LEVEL_##level)
 #define HID_PLOG(level)                         \
@@ skipping 16 matching lines @@
   SCOPED_DEVICE_LOG_IF_SLOW(::device_event_log::LOG_TYPE_NETWORK)
 
 // Generally prefer the above macros unless |type| is not constant.
 
 #define SCOPED_DEVICE_LOG_IF_SLOW(type)               \
   ::device_event_log::internal::ScopedDeviceLogIfSlow \
       scoped_device_log_if_slow(type, __FILE__, __func__)
 
 namespace device_event_log {
 
-// Used to specify the type of event. NOTE: Be sure to update LogTypeFromString
-// and GetLogTypeString when adding entries to this enum. Also consider
-// updating chrome://device-log (see device_log_ui.cc).
+// Used to specify the type of event. Consider updating chrome://device-log
+// when adding new types (see device_log_ui.cc).
 enum LogType {
   // Shill / network configuration related events.
-  LOG_TYPE_NETWORK,
+  LOG_TYPE_NETWORK = 0,
   // Power manager related events.
-  LOG_TYPE_POWER,
+  LOG_TYPE_POWER = 1,
   // Login related events.
-  LOG_TYPE_LOGIN,
+  LOG_TYPE_LOGIN = 2,
+  // Bluetooth device related events (i.e. device/bluetooth).
+  LOG_TYPE_BLUETOOTH = 3,
   // USB device related events (i.e. device/usb).
-  LOG_TYPE_USB,
+  LOG_TYPE_USB = 4,
   // Human-interface device related events (i.e. device/hid).
-  LOG_TYPE_HID,
-  // Used internally
-  LOG_TYPE_UNKNOWN
+  LOG_TYPE_HID = 5,
+  // Used internally, must be the last type (may be changed).
+  LOG_TYPE_UNKNOWN = 6
 };
 
 // Used to specify the detail level for logging. In GetAsString, used to
 // specify the maximum detail level (i.e. EVENT will include USER and ERROR).
 // See top-level comment for guidelines for each type.
 enum LogLevel {
   LOG_LEVEL_ERROR = 0,
   LOG_LEVEL_USER = 1,
   LOG_LEVEL_EVENT = 2,
   LOG_LEVEL_DEBUG = 3
@@ skipping 114 matching lines @@
   LogType type_;
   std::string name_;
   base::ElapsedTimer timer_;
 };
 
 }  // namespace internal
 
 }  // namespace device_event_log
 
 #endif  // DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_H_