usb_gadget: Switch to official Google product IDs.

These product IDs have been assigned under the Google vendor ID for
this project.

BUG=396682

Review URL: https://codereview.chromium.org/436213005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287629 0039d316-1c4b-4281-b951-d872f2087c98

device/test/usb_test_gadget_impl.cc

@@ -58,10 +58,10 @@ struct UsbTestGadgetConfiguration {
 };
 
 static const struct UsbTestGadgetConfiguration kConfigurations[] = {
-  { UsbTestGadget::DEFAULT, "/unconfigure", 0x2000 },
-  { UsbTestGadget::KEYBOARD, "/keyboard/configure", 0x2001 },
-  { UsbTestGadget::MOUSE, "/mouse/configure", 0x2002 },
-  { UsbTestGadget::HID_ECHO, "/hid_echo/configure", 0x2003 },
+  { UsbTestGadget::DEFAULT, "/unconfigure", 0x58F0 },
+  { UsbTestGadget::KEYBOARD, "/keyboard/configure", 0x58F1 },
+  { UsbTestGadget::MOUSE, "/mouse/configure", 0x58F2 },
+  { UsbTestGadget::HID_ECHO, "/hid_echo/configure", 0x58F3 },
 };
 
 class UsbTestGadgetImpl : public UsbTestGadget {
@@ -206,7 +206,7 @@ bool UsbTestGadgetImpl::FindUnclaimed() {
   for (std::vector<scoped_refptr<UsbDevice> >::const_iterator iter =
          devices.begin(); iter != devices.end(); ++iter) {
     const scoped_refptr<UsbDevice> &device = *iter;
-    if (device->vendor_id() == 0x18D1 && device->product_id() == 0x2000) {
+    if (device->vendor_id() == 0x18D1 && device->product_id() == 0x58F0) {
       scoped_refptr<UsbDeviceHandle> handle = device->Open();
       if (handle.get() == NULL) {
         continue;

tools/usb_gadget/usb_constants.py

@@ -162,8 +162,7 @@ class VendorID(object):
 
 
 class ProductID(object):
-  # TODO(reillyg): Get officially assigned IDs for these devices.
-  GOOGLE_TEST_GADGET = 0x2000
-  GOOGLE_KEYBOARD_GADGET = 0x2001
-  GOOGLE_MOUSE_GADGET = 0x2002
-  GOOGLE_HID_ECHO_GADGET = 0x2003
+  GOOGLE_TEST_GADGET = 0x58F0
+  GOOGLE_KEYBOARD_GADGET = 0x58F1
+  GOOGLE_MOUSE_GADGET = 0x58F2
+  GOOGLE_HID_ECHO_GADGET = 0x58F3