Merge components/usb_service into device/usb.

device/test/usb_test_gadget_impl.cc

 // 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.
 
 #include "device/test/usb_test_gadget.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "components/usb_service/usb_device.h"
-#include "components/usb_service/usb_device_handle.h"
-#include "components/usb_service/usb_service.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_device_handle.h"
+#include "device/usb/usb_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 using ::base::PlatformThread;
 using ::base::TimeDelta;
-using ::usb_service::UsbDevice;
-using ::usb_service::UsbDeviceHandle;
-using ::usb_service::UsbService;
 
 namespace device {
 
 namespace {
 
 static const char kCommandLineSwitch[] = "enable-gadget-tests";
 static const int kClaimRetries = 100;  // 5 seconds
 static const int kDisconnectRetries = 100;  // 5 seconds
 static const int kRetryPeriod = 50;  // 0.05 seconds
 static const int kReconnectRetries = 100;  // 5 seconds
@@ skipping 474 matching lines @@
     }
     PlatformThread::Sleep(TimeDelta::FromMilliseconds(kRetryPeriod));
   }
   VLOG(1) << "It took " << (kDisconnectRetries - retries)
           << " retries for the device to reconnect.";
 
   return true;
 }
 
 }  // namespace device