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/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_notifications_histogram.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 namespace {
 
 // Returns true if the requested device is valid, else false. On success, fills
 // in |unique_id| and |device_label|
 bool GetDeviceInfo(const std::string& source_path, std::string* unique_id,
                    string16* device_label) {
@@ skipping 114 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());
-  if (unique_id.empty())
-    return;
-
   chrome::MediaStorageUtil::Type type = has_dcim ?
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
+  // Keep track of device uuid, to see how often we receive empty uuid values.

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

update comment.

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

Done.

+  RecordDeviceInfoHistogram(type, unique_id, device_label);
+  if (unique_id.empty() || device_label.empty())
+    return;
+
   std::string device_id = chrome::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