Enable USB gadget tests on OS X.

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"
@@ skipping 53 matching lines @@
 
 class UsbTestGadgetImpl : public UsbTestGadget {
  public:
   ~UsbTestGadgetImpl() override;
 
   bool Unclaim() override;
   bool Disconnect() override;
   bool Reconnect() override;
   bool SetType(Type type) override;
   UsbDevice* GetDevice() const override;
-  std::string GetSerialNumber() const override;
+  const std::string& GetSerialNumber() const override;
 
  protected:
   UsbTestGadgetImpl();
 
  private:
   scoped_ptr<net::URLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcher::RequestType request_type,
       net::URLFetcherDelegate* delegate);
   int SimplePOSTRequest(const GURL& url, const std::string& form_data);
@@ skipping 74 matching lines @@
 UsbTestGadgetImpl::~UsbTestGadgetImpl() {
   if (!device_address_.empty()) {
     Unclaim();
   }
 }
 
 UsbDevice* UsbTestGadgetImpl::GetDevice() const {
   return device_.get();
 }
 
-std::string UsbTestGadgetImpl::GetSerialNumber() const {
+const std::string& UsbTestGadgetImpl::GetSerialNumber() const {
   return device_address_;
 }
 
 scoped_ptr<net::URLFetcher> UsbTestGadgetImpl::CreateURLFetcher(
     const GURL& url, net::URLFetcher::RequestType request_type,
     net::URLFetcherDelegate* delegate) {
   scoped_ptr<net::URLFetcher> url_fetcher(
       net::URLFetcher::Create(url, request_type, delegate));
 
-  url_fetcher->SetRequestContext(
-      new net::TrivialURLRequestContextGetter(
-          request_context_.get(),
-          base::MessageLoop::current()->message_loop_proxy()));
+  url_fetcher->SetRequestContext(new net::TrivialURLRequestContextGetter(
+      request_context_.get(), base::MessageLoop::current()->task_runner()));
 
   return url_fetcher;
 }
 
 int UsbTestGadgetImpl::SimplePOSTRequest(const GURL& url,
                                          const std::string& form_data) {
   Delegate delegate;
   scoped_ptr<net::URLFetcher> url_fetcher =
     CreateURLFetcher(url, net::URLFetcher::POST, &delegate);
 
@@ skipping 226 matching lines @@
 bool UsbTestGadgetImpl::Unclaim() {
   VLOG(1) << "Releasing the device at " << device_address_ << ".";
 
   const GURL url("http://" + device_address_ + "/unclaim");
   const int response_code = SimplePOSTRequest(url, "");
 
   if (response_code != 200) {
     LOG(ERROR) << "Unexpected HTTP " << response_code << " from /unclaim.";
     return false;
   }
+
+  device_address_.clear();
   return true;
 }
 
 bool UsbTestGadgetImpl::SetType(Type type) {
   const struct UsbTestGadgetConfiguration* config = NULL;
   for (size_t i = 0; i < arraysize(kConfigurations); ++i) {
     if (kConfigurations[i].type == type) {
       config = &kConfigurations[i];
     }
   }
@@ skipping 75 matching lines @@
     }
     PlatformThread::Sleep(TimeDelta::FromMilliseconds(kRetryPeriod));
   }
   VLOG(1) << "It took " << (kDisconnectRetries - retries)
           << " retries for the device to reconnect.";
 
   return true;
 }
 
 }  // namespace device