Move string descriptor getters from UsbDeviceHandle to UsbDevice.

device/hid/hid_connection_unittest.cc

 // Copyright (c) 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 82 matching lines @@
     ASSERT_NE(device_id_, kInvalidHidDeviceId);
   }
 
   void FindDevice(const base::Closure& done, int retries) {
     std::vector<HidDeviceInfo> devices;
     service_->GetDevices(&devices);
 
     for (std::vector<HidDeviceInfo>::iterator it = devices.begin();
          it != devices.end();
          ++it) {
-      if (it->serial_number == test_gadget_->GetSerial()) {
+      if (it->serial_number == test_gadget_->GetSerialNumber()) {
         device_id_ = it->device_id;
         break;
       }
     }
 
     if (device_id_ == kInvalidHidDeviceId && --retries > 0) {
       message_loop_->PostDelayedTask(
           FROM_HERE,
           base::Bind(&HidConnectionTest::FindDevice, base::Unretained(this),
                      done, retries),
@@ skipping 31 matching lines @@
     ASSERT_TRUE(read_callback.WaitForResult());
     ASSERT_EQ(9UL, read_callback.size());
     ASSERT_EQ(0, read_callback.buffer()->data()[0]);
     for (int j = 1; j < buffer->size(); ++j) {
       ASSERT_EQ(i + j - 1, read_callback.buffer()->data()[j]);
     }
   }
 }
 
 }  // namespace device