bluetooth: Fix layering violation in BluetoothChooserController

chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc

 // Copyright 2015 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 "chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/net/referrer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
-#include "content/browser/bluetooth/bluetooth_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
+enum class BluetoothChooserInteractionType { VALID = 0, INVALID = 1, COUNT };
+
 Browser* GetBrowser() {
   chrome::ScopedTabbedBrowserDisplayer browser_displayer(
       ProfileManager::GetActiveUserProfile());
   DCHECK(browser_displayer.browser());
   return browser_displayer.browser();
 }
 
+void RecordInteractionWithChooser(bool has_null_handler) {
+  UMA_HISTOGRAM_ENUMERATION(

[Ilya Sherman, 2016/08/26 00:17:44]

nit: UMA_HISTOGRAM_BOOLEAN probably is the best choice for this use.

[ortuno, 2016/08/26 16:14:36]

Done.

+      "Bluetooth.Web.ChooserInteraction",
+      static_cast<int>(has_null_handler
+                       ? BluetoothChooserInteractionType::INVALID
+                       : BluetoothChooserInteractionType::VALID),
+      static_cast<int>(BluetoothChooserInteractionType::COUNT));
+}
+
 }  // namespace
 
 BluetoothChooserController::BluetoothChooserController(
     content::RenderFrameHost* owner,
     const content::BluetoothChooser::EventHandler& event_handler)
     : ChooserController(owner,
                         IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_ORIGIN,
                         IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME),
       event_handler_(event_handler),
       no_devices_text_(l10n_util::GetStringUTF16(
@@ skipping 30 matching lines @@
   const auto& it = device_name_counts_.find(device_name_it->second);
   DCHECK(it != device_name_counts_.end());
   return it->second == 1
              ? device_name_it->second
              : l10n_util::GetStringFUTF16(
                    IDS_DEVICE_CHOOSER_DEVICE_NAME_WITH_ID,
                    device_name_it->second, base::UTF8ToUTF16(device_id));
 }
 
 void BluetoothChooserController::RefreshOptions() {
+  RecordInteractionWithChooser(event_handler_.is_null());
   if (event_handler_.is_null())
     return;
   ClearAllDevices();
   event_handler_.Run(content::BluetoothChooser::Event::RESCAN, std::string());
 }
 
 base::string16 BluetoothChooserController::GetStatus() const {
   return status_text_;
 }
 
 void BluetoothChooserController::Select(size_t index) {
+  RecordInteractionWithChooser(event_handler_.is_null());
   if (event_handler_.is_null()) {
-    content::RecordRequestDeviceOutcome(
-        content::UMARequestDeviceOutcome::
-            BLUETOOTH_CHOOSER_EVENT_HANDLER_INVALID);
     return;
   }
   DCHECK_LT(index, devices_.size());
   event_handler_.Run(content::BluetoothChooser::Event::SELECTED,
                      devices_[index].id);
 }
 
 void BluetoothChooserController::Cancel() {
+  RecordInteractionWithChooser(event_handler_.is_null());
   if (event_handler_.is_null())
     return;
   event_handler_.Run(content::BluetoothChooser::Event::CANCELLED,
                      std::string());
 }
 
 void BluetoothChooserController::Close() {
+  RecordInteractionWithChooser(event_handler_.is_null());
   if (event_handler_.is_null())
     return;
   event_handler_.Run(content::BluetoothChooser::Event::CANCELLED,
                      std::string());
 }
 
 void BluetoothChooserController::OpenHelpCenterUrl() const {
   GetBrowser()->OpenURL(content::OpenURLParams(
       GURL(chrome::kChooserBluetoothOverviewURL), content::Referrer(),
       NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
@@ skipping 131 matching lines @@
 
 void BluetoothChooserController::ResetEventHandler() {
   event_handler_.Reset();
 }
 
 void BluetoothChooserController::ClearAllDevices() {
   devices_.clear();
   device_id_to_name_map_.clear();
   device_name_counts_.clear();
 }