Revert 147594 - NaCl: Remove two uses of '#include "nacl/nacl_log.h"'

chrome/browser/extensions/api/usb/usb_device_resource.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/extensions/api/usb/usb_device_resource.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 83 matching lines @@
 template<class T>
 static bool GetTransferSize(const T& input, size_t* output) {
   if (input.direction == kDirectionIn) {
     const int* length = input.length.get();
     if (length) {
       *output = *length;
       return true;
     }
   } else if (input.direction == kDirectionOut) {
     if (input.data.get()) {
-      *output = input.data->GetSize();
+      *output = input.data->size();
       return true;
     }
   }
   return false;
 }
 
 template<class T>
 static scoped_refptr<net::IOBuffer> CreateBufferForTransfer(const T& input) {
   size_t size = 0;
   if (!GetTransferSize(input, &size)) {
     return NULL;
   }
 
   scoped_refptr<net::IOBuffer> buffer = new net::IOBuffer(size);
   if (!input.data.get()) {
     return buffer;
   }
 
-  memcpy(buffer->data(), input.data->GetBuffer(), size);
+  memcpy(buffer->data(), input.data->data(), size);
 
   return buffer;
 }
 
 static const char* ConvertTransferStatusToErrorString(
     const UsbTransferStatus status) {
   switch (status) {
     case USB_TRANSFER_COMPLETED:
       return "";
     case USB_TRANSFER_ERROR:
@@ skipping 103 matching lines @@
                                          UsbTransferStatus status) {
   if (buffer) {
     base::BinaryValue* const response_buffer =
         base::BinaryValue::CreateWithCopiedBuffer(buffer->data(), length);
     event_notifier()->OnTransferComplete(status,
         ConvertTransferStatusToErrorString(status), response_buffer);
   }
 }
 
 }  // namespace extensions