Battery Status API: add UMA logging for Mac.

content/browser/battery_status/battery_status_manager_mac.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/browser/battery_status/battery_status_manager.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/ps/IOPowerSources.h>
 #include <IOKit/ps/IOPSKeys.h>
+#include <vector>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
+#include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
 
 namespace content {
 
 namespace {
 
 typedef BatteryStatusService::BatteryUpdateCallback BatteryCallback;
 
@@ skipping 21 matching lines @@
 
   return boolean ? CFBooleanGetValue(boolean) : default_value;
 }
 
 bool CFStringsAreEqual(CFStringRef string1, CFStringRef string2) {
   if (!string1 || !string2)
     return false;
   return CFStringCompare(string1, string2, 0) == kCFCompareEqualTo;
 }
 
+void UpdateNumberBatteriesHistogram(int count) {
+  UMA_HISTOGRAM_CUSTOM_COUNTS(
+      "BatteryStatus.NumberBatteriesMac", count, 1, 5, 6);
+}
+
 void FetchBatteryStatus(CFDictionaryRef description,
                         blink::WebBatteryStatus& status) {
   CFStringRef current_state =
       base::mac::GetValueFromDictionary<CFStringRef>(description,
           CFSTR(kIOPSPowerSourceStateKey));
 
   bool on_battery_power =
       CFStringsAreEqual(current_state, CFSTR(kIOPSBatteryPowerValue));
   bool is_charging =
       GetValueAsBoolean(description, CFSTR(kIOPSIsChargingKey), true);
@@ skipping 36 matching lines @@
       SInt64 discharging_time =
           GetValueAsSInt64(description, CFSTR(kIOPSTimeToEmptyKey), -1);
       if (discharging_time != -1) {
         status.dischargingTime =
             base::TimeDelta::FromMinutes(discharging_time).InSeconds();
       }
     }
   }
 }
 
-void OnBatteryStatusChanged(const BatteryCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  blink::WebBatteryStatus status;
+std::vector<blink::WebBatteryStatus> GetInternalBatteriesStates() {
+  std::vector<blink::WebBatteryStatus> internal_sources;
+
   base::ScopedCFTypeRef<CFTypeRef> info(IOPSCopyPowerSourcesInfo());
   base::ScopedCFTypeRef<CFArrayRef> power_sources_list(
       IOPSCopyPowerSourcesList(info));
   CFIndex count = CFArrayGetCount(power_sources_list);
 
-  bool internal_source_found = false;
-
   for (CFIndex i = 0; i < count; ++i) {
     CFDictionaryRef description = IOPSGetPowerSourceDescription(info,
         CFArrayGetValueAtIndex(power_sources_list, i));
 
     if (!description)
       continue;
 
     CFStringRef transport_type =
         base::mac::GetValueFromDictionary<CFStringRef>(description,
             CFSTR(kIOPSTransportTypeKey));
 
     bool internal_source =
         CFStringsAreEqual(transport_type, CFSTR(kIOPSInternalType));
     bool source_present =
         GetValueAsBoolean(description, CFSTR(kIOPSIsPresentKey), false);
 
     if (internal_source && source_present) {
-      // TODO(timvolodine): implement the case when there are multiple internal
-      // sources, e.g. when multiple batteries are present. Currently this will
-      // fail a DCHECK.
-      DCHECK(!internal_source_found);
+      blink::WebBatteryStatus status;
       FetchBatteryStatus(description, status);
-      internal_source_found = true;
+      internal_sources.push_back(status);
     }
   }
 
-  callback.Run(status);
+  return internal_sources;
+}
+
+void OnBatteryStatusChanged(const BatteryCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  std::vector<blink::WebBatteryStatus> batteries(GetInternalBatteriesStates());
+
+  if (batteries.empty()) {
+    callback.Run(blink::WebBatteryStatus());
+    return;
+  }
+
+  // TODO(timvolodine): implement the case when there are multiple internal
+  // sources, e.g. when multiple batteries are present. Currently this will
+  // fail a DCHECK.
+  DCHECK(batteries.size() == 1);
+  callback.Run(batteries.front());
 }
 
 class BatteryStatusObserver
     : public base::RefCountedThreadSafe<BatteryStatusObserver> {
  public:
   explicit BatteryStatusObserver(const BatteryCallback& callback)
       : callback_(callback) {}
 
   void Start() {
     // Need to start on a thread with UI-type message loop for
@@ skipping 35 matching lines @@
     if (!notifier_run_loop_source_) {
       LOG(ERROR) << "Failed to create battery status notification run loop";
       // Make sure to execute to callback with the default values.
       callback_.Run(blink::WebBatteryStatus());
       return;
     }
 
     OnBatteryStatusChangedUI(static_cast<void*>(&callback_));
     CFRunLoopAddSource(CFRunLoopGetCurrent(), notifier_run_loop_source_,
                        kCFRunLoopDefaultMode);
+    UpdateNumberBatteriesHistogram(GetInternalBatteriesStates().size());
   }
 
   void StopOnUI() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     if (!notifier_run_loop_source_)
       return;
 
     CFRunLoopRemoveSource(CFRunLoopGetCurrent(), notifier_run_loop_source_,
                           kCFRunLoopDefaultMode);
@@ skipping 46 matching lines @@
 } // end namespace
 
 // static
 scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
     const BatteryStatusService::BatteryUpdateCallback& callback) {
   return scoped_ptr<BatteryStatusManager>(
       new BatteryStatusManagerMac(callback));
 }
 
 }  // namespace content