Combine boolean MediaDeviceNotifications histograms to an enumerated histogram.

chrome/browser/system_monitor/removable_device_notifications_linux.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.
 
 // RemovableDeviceNotificationsLinux implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 
 #include <libudev.h>
 #include <mntent.h>
 #include <stdio.h>
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_generic_obj.h"
-#include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_histogram.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 namespace chrome {
 
 using base::SystemMonitor;
 using content::BrowserThread;
 
 namespace {
 
 static RemovableDeviceNotificationsLinux*
@@ skipping 426 matching lines @@
     mount_info_map_[mount_point] =
         mount_info_map_.find(other_mount_point)->second;
     return;
   }
 
   std::string unique_id;
   string16 name;
   bool removable;
   get_device_info_func_(mount_device, &unique_id, &name, &removable);
 
-
-  // Keep track of device uuid, to see how often we receive empty values.
-  UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceUUIDAvailable",
-                        !unique_id.empty());
-  UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceNameAvailable",
-                        !name.empty());
-  if (unique_id.empty() || name.empty())
-    return;
-
   bool has_dcim = IsMediaDevice(mount_point.value());
   MediaStorageUtil::Type type;
   if (removable) {
     if (has_dcim) {
       type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM;
     } else {
       type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
     }
   } else {
     type = MediaStorageUtil::FIXED_MASS_STORAGE;
   }
+
+  // Keep track of device info details to see how often we get invalid values.
+  RecordDeviceInfoHistogram(type, unique_id, name);
+  if (unique_id.empty() || name.empty())

[vandebo (ex-Chrome), 2012/09/16 22:27:46]

No point in figuring out the precise type if we're going to return and ignore
it... See other comment about type

[kmadhusu, 2012/09/17 18:29:07]

Fixed.

+    return;
+
   std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
 
   MountPointInfo mount_point_info;
   mount_point_info.mount_device = mount_device;
   mount_point_info.device_id = device_id;
   mount_point_info.device_name = name;
 
   mount_info_map_[mount_point] = mount_point_info;
   mount_priority_map_[mount_device][mount_point] = removable;
 
   if (removable) {
     SystemMonitor::Get()->ProcessRemovableStorageAttached(device_id, name,
                                                           mount_point.value());
   }
 }
 
 }  // namespace chrome