Move //components/webusb/ to //chrome/browser/

chrome/browser/usb/web_usb_detector.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/chrome_webusb_browser_client.h"
+#include "chrome/browser/usb/web_usb_detector.h"
 
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
 #include "base/macros.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/browser.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/common/origin_util.h"
+#include "device/core/device_client.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_ids.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 #include "url/gurl.h"
 
@@ skipping 70 matching lines @@
 
   GURL landing_page_;
   std::string notification_id_;
   bool clicked_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WebUsbNotificationDelegate);
 };
 
 }  // namespace
 
-ChromeWebUsbBrowserClient::ChromeWebUsbBrowserClient() {}
+WebUsbDetector::WebUsbDetector() : observer_(this) {
+  Initialize();
+}
 
-ChromeWebUsbBrowserClient::~ChromeWebUsbBrowserClient() {}
+WebUsbDetector::~WebUsbDetector() {}
 
-void ChromeWebUsbBrowserClient::OnDeviceAdded(
-    const base::string16& product_name,
-    const GURL& landing_page,
-    const std::string& notification_id) {
-  if (!content::IsOriginSecure(landing_page)) {
+void WebUsbDetector::Initialize() {
+  device::UsbService* usb_service =
+      device::DeviceClient::Get()->GetUsbService();
+  if (!usb_service)
+    return;
+
+  observer_.Add(usb_service);
+}
+
+void WebUsbDetector::OnDeviceAdded(scoped_refptr<device::UsbDevice> device) {
+  const base::string16& product_name = device->product_string();
+  if (product_name.empty()) {
     return;
   }
 
+  const GURL& landing_page = device->webusb_landing_page();
+  if (!landing_page.is_valid() || !content::IsOriginSecure(landing_page)) {
+    return;
+  }
+
+  std::string notification_id = device->guid();
+
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   message_center::RichNotificationData rich_notification_data;
   std::unique_ptr<message_center::Notification> notification(
       new message_center::Notification(
           message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
           l10n_util::GetStringFUTF16(
               IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION_TITLE, product_name),
           l10n_util::GetStringFUTF16(
               IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION,
               base::UTF8ToUTF16(landing_page.GetContent())),
           rb.GetNativeImageNamed(IDR_USB_NOTIFICATION_ICON), base::string16(),
           GURL(),
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT, kNotifierWebUsb),
           rich_notification_data,
           new WebUsbNotificationDelegate(landing_page, notification_id)));
 
   notification->SetSystemPriority();
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
-void ChromeWebUsbBrowserClient::OnDeviceRemoved(
-    const std::string& notification_id) {
+void WebUsbDetector::OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) {
+  std::string notification_id = device->guid();
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
   if (message_center->FindVisibleNotificationById(notification_id)) {
     message_center->RemoveNotification(notification_id, false /* by_user */);
   }
 }