Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / metrics / chrome_browser_main_extra_parts_metrics.cc

diff --git a/src/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/src/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index bd9ccf2..394a50c 100644 (file)
--- a/src/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/src/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_metrics_service_observer.h"
+#include "chrome/browser/mac/bluetooth_utility.h"
 #include "chrome/browser/pref_service_flags_storage.h"
 #include "chrome/browser/shell_integration.h"
 #include "content/public/browser/browser_thread.h"
@@ -94,6 +95,14 @@ void RecordStartupMetricsOnBlockingPool() {
 #if defined(OS_WIN)
   GoogleUpdateSettings::RecordChromeUpdatePolicyHistograms();
 #endif  // defined(OS_WIN)
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  bluetooth_utility::BluetoothAvailability availability =
+      bluetooth_utility::GetBluetoothAvailability();
+  UMA_HISTOGRAM_ENUMERATION("OSX.BluetoothAvailability",
+                            availability,
+                            bluetooth_utility::BLUETOOTH_AVAILABILITY_COUNT);
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 void RecordLinuxGlibcVersion() {
@@ -124,7 +133,7 @@ void RecordLinuxGlibcVersion() {
 }
 
 void RecordLinuxWindowManager() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
   ui::WindowManagerName name = ui::GuessWindowManager();
   UMALinuxWindowManager uma_name = UMA_LINUX_WINDOW_MANAGER_OTHER;
   switch (name) {