Remove BrowserThread dependency from usb_service.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2261 matching lines @@
       'browser/chrome_browser_field_trials_mobile.h',
       'browser/metrics/variations/variations_request_scheduler_mobile.cc',
       'browser/metrics/variations/variations_request_scheduler_mobile.h',
       'browser/net/spdyproxy/proxy_advisor.cc',
       'browser/net/spdyproxy/proxy_advisor.h',
     ],
     # Everything but Android and iOS.
     'chrome_browser_non_mobile_sources': [
       'browser/chrome_browser_field_trials_desktop.cc',
       'browser/chrome_browser_field_trials_desktop.h',
+      'browser/chrome_device_client.cc',
+      'browser/chrome_device_client.h',
     ],
     'chrome_browser_supervised_user_sources': [
       'browser/supervised_user/custodian_profile_downloader_service.cc',
       'browser/supervised_user/custodian_profile_downloader_service.h',
       'browser/supervised_user/custodian_profile_downloader_service_factory.cc',
       'browser/supervised_user/custodian_profile_downloader_service_factory.h',
       'browser/supervised_user/permission_request_creator.h',
       'browser/supervised_user/permission_request_creator_apiary.cc',
       'browser/supervised_user/permission_request_creator_apiary.h',
       'browser/supervised_user/permission_request_creator_sync.cc',
@@ skipping 626 matching lines @@
             '../components/components.gyp:dom_distiller_content',
             '../components/components.gyp:keyed_service_content',
             '../components/components.gyp:navigation_interception',
             '../components/components.gyp:password_manager_content_browser',
             '../components/components.gyp:power',
             '../components/components.gyp:precache_content',
             '../components/components.gyp:sessions',
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:translate_content_browser',
             '../components/components.gyp:url_matcher',
-            '../components/components.gyp:usb_service',
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:web_modal',
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/cast/cast.gyp:cast_net',
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_cpp_bindings',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
             '../mojo/mojo_base.gyp:mojo_js_bindings',
@@ skipping 304 matching lines @@
         ['enable_captive_portal_detection==1', {
           'sources': [ '<@(chrome_browser_captive_portal_sources)' ]
         }],
         ['enable_session_service==1', {
           'sources': [ '<@(chrome_browser_session_service_sources)' ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources': [ '<@(chrome_browser_mobile_sources)' ],
         }, {  # OS!="android" and OS!="ios"
           'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
+          'dependencies': [
+            '../components/components.gyp:usb_service',
+            '../device/core/core.gyp:device_core',
+          ]
         }],
         ['OS=="android"', {
           'dependencies': [
             '../components/components.gyp:cdm_browser',
             '../components/components.gyp:enhanced_bookmarks',
             '../components/components.gyp:web_contents_delegate_android',
             '../third_party/android_opengl/etc1/etc1.gyp:etc1',
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
             '../components/components.gyp:feedback_component',
             '../components/components.gyp:storage_monitor',
-            '../components/components.gyp:usb_service',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
           'sources': [ '<@(chrome_browser_android_sources)' ],
         }, {  # Non-Android.
           'sources': [ '<@(chrome_browser_non_android_sources)' ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ skipping 301 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }