Combine boolean MediaDeviceNotifications histograms to an enumerated histogram.

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
@@ skipping 51 matching lines @@
   if (unique_id)
     *unique_id = MakeDeviceUniqueId(*disk);
 
   if (device_label)
     *device_label = GetDeviceName(*disk);
   return true;
 }
 
 }  // namespace
 
+using chrome::MediaStorageUtil;
 using content::BrowserThread;
 
 RemovableDeviceNotificationsCros::RemovableDeviceNotificationsCros() {
   DCHECK(disks::DiskMountManager::GetInstance());
   disks::DiskMountManager::GetInstance()->AddObserver(this);
   CheckExistingMountPointsOnUIThread();
 }
 
 RemovableDeviceNotificationsCros::~RemovableDeviceNotificationsCros() {
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
@@ skipping 86 matching lines @@
     NOTREACHED();
     return;
   }
 
   // Get the media device uuid and label if exists.
   std::string unique_id;
   string16 device_label;
   if (!GetDeviceInfo(mount_info.source_path, &unique_id, &device_label))
     return;
 
-  // Keep track of device uuid, to see how often we receive empty uuid values.
-  UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceUUIDAvailable",
-                        !unique_id.empty());
-  UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceNameAvailable",
-                        !device_label.empty());
+  // Keep track of device uuid and label, to see how often we receive empty
+  // values.
+  MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, device_label);
   if (unique_id.empty() || device_label.empty())
     return;
 
-  chrome::MediaStorageUtil::Type type = has_dcim ?
-      chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
-      chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
+  MediaStorageUtil::Type type = has_dcim ?
+      MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
+      MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
-  std::string device_id = chrome::MediaStorageUtil::MakeDeviceId(type,
-                                                                 unique_id);
+  std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
   mount_map_.insert(std::make_pair(mount_info.mount_path, device_id));
   base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
       device_id,
       device_label,
       mount_info.mount_path);
 }
 
 }  // namespace chrome