Merge components/usb_service into device/usb.

chrome/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//components/nacl/nacl_defines.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 430 matching lines @@
 
   if (is_android || is_ios) {
     # Mobile.
     sources += rebase_path(gypi_values.chrome_browser_mobile_sources,
                            ".", "//chrome")
   } else {
     # Non-mobile.
     sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
                            ".", "//chrome")
     deps += [
-      "//components/usb_service",
       "//device/core",
+      "//device/usb",
     ]
   }
 
   if (is_android) {
     sources += rebase_path(gypi_values.chrome_browser_android_sources,
                            ".", "//chrome")
     deps += [
       "//components/cdm/browser",
       #"../components/components.gyp:web_contents_delegate_android",  TODO(GYP)
       #"chrome_browser_jni_headers",  TODO(GYP)
@@ skipping 199 matching lines @@
 # TODO(GYP) write internal action
 if (false) {  #if (is_chrome_branded) {
   action("chrome_internal_resources_gen") {
     # TODO(GYP)
   }
 } else {
   group("chrome_internal_resources_gen") {
     # Empty placeholder.
   }
 }