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

chrome/browser/chrome_browser_main.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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 239 matching lines @@
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/browser/media/webrtc_log_util.h"
 #endif  // defined(ENABLE_WEBRTC)
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif  // defined(USE_AURA)
 
 #if !defined(OS_ANDROID)
-#include "chrome/browser/chrome_webusb_browser_client.h"
-#include "components/webusb/webusb_detector.h"
+#include "chrome/browser/usb/web_usb_detector.h"
 #endif
 
 #if defined(MOJO_SHELL_CLIENT)
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "services/shell/runner/common/client_util.h"
 #endif
 
 using content::BrowserThread;
 
@@ skipping 1087 matching lines @@
       base::TimeDelta::FromMinutes(1));
 #endif  // defined(ENABLE_WEBRTC)
 
 #if !defined(OS_ANDROID)
   // WebUSB is an experimental web API. The sites these notifications will link
   // to will only work if the experiment is enabled and WebUSB feature is
   // enabled.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalWebPlatformFeatures) &&
       base::FeatureList::IsEnabled(features::kWebUsb)) {
-    webusb_browser_client_.reset(new ChromeWebUsbBrowserClient());
-    webusb_detector_.reset(
-        new webusb::WebUsbDetector(webusb_browser_client_.get()));
+    web_usb_detector_.reset(new WebUsbDetector());
   }
 #endif
 
   // At this point, StartupBrowserCreator::Start has run creating initial
   // browser windows and tabs, but no progress has been made in loading
   // content as the main message loop hasn't started processing tasks yet.
   // We setup to observe to the initial page load here to defer running
   // task posted via PostAfterStartupTask until its complete.
   AfterStartupTaskUtils::StartMonitoringStartup();
 }
@@ skipping 582 matching lines @@
       g_browser_process->local_state());
   shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300));
 
   // Disarm the startup hang detector time bomb if it is still Arm'ed.
   startup_watcher_->Disarm();
 
   // Remove observers attached to D-Bus clients before DbusThreadManager is
   // shut down.
   process_power_collector_.reset();
 
-  webusb_detector_.reset();
-  webusb_browser_client_.reset();
+  web_usb_detector_.reset();
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostMainMessageLoopRun();
 
   // Some tests don't set parameters.ui_task, so they started translate
   // language fetch that was never completed so we need to cleanup here
   // otherwise it will be done by the destructor in a wrong thread.
   TranslateService::Shutdown(parameters().ui_task == NULL);
 
   if (notify_result_ == ProcessSingleton::PROCESS_NONE)
@@ skipping 52 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }