Media gallery fixups for scoped_refptr<T> operator T* removal.

BUG=110610

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

Cr-Commit-Position: refs/heads/master@{#292664}

chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h

@@ -92,11 +92,12 @@ class MTPDeviceAsyncDelegate {
   // Reads up to |buf_len| bytes from |device_file_path| into |buf|. Invokes the
   // appropriate callback asynchronously when complete. Only valid when
   // IsStreaming() is true.
-  virtual void ReadBytes(
-      const base::FilePath& device_file_path,
-      net::IOBuffer* buf, int64 offset, int buf_len,
-      const ReadBytesSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) = 0;
+  virtual void ReadBytes(const base::FilePath& device_file_path,
+                         const scoped_refptr<net::IOBuffer>& buf,
+                         int64 offset,
+                         int buf_len,
+                         const ReadBytesSuccessCallback& success_callback,
+                         const ErrorCallback& error_callback) = 0;
 
   // Called when the
   // (1) Browser application is in shutdown mode (or)

chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.cc

@@ -42,7 +42,7 @@ void CallInt64CompletionCallbackWithPlatformFileError(
 
 void ReadBytes(
     const storage::FileSystemURL& url,
-    net::IOBuffer* buf,
+    const scoped_refptr<net::IOBuffer>& buf,
     int64 offset,
     int buf_len,
     const MTPDeviceAsyncDelegate::ReadBytesSuccessCallback& success_callback,
@@ -55,7 +55,7 @@ void ReadBytes(
 
   delegate->ReadBytes(
       url.path(),
-      make_scoped_refptr(buf),
+      buf,
       offset,
       buf_len,
       success_callback,

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

@@ -410,7 +410,9 @@ bool MTPDeviceDelegateImplLinux::IsStreaming() {
 
 void MTPDeviceDelegateImplLinux::ReadBytes(
     const base::FilePath& device_file_path,
-    net::IOBuffer* buf, int64 offset, int buf_len,
+    const scoped_refptr<net::IOBuffer>& buf,
+    int64 offset,
+    int buf_len,
     const ReadBytesSuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -419,7 +421,7 @@ void MTPDeviceDelegateImplLinux::ReadBytes(
       base::Bind(&MTPDeviceDelegateImplLinux::ReadBytesInternal,
                  weak_ptr_factory_.GetWeakPtr(),
                  device_file_path,
-                 make_scoped_refptr(buf),
+                 buf,
                  offset,
                  buf_len,
                  success_callback,

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h

@@ -85,11 +85,12 @@ class MTPDeviceDelegateImplLinux : public MTPDeviceAsyncDelegate {
       const CreateSnapshotFileSuccessCallback& success_callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
-  virtual void ReadBytes(
-      const base::FilePath& device_file_path,
-      net::IOBuffer* buf, int64 offset, int buf_len,
-      const ReadBytesSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void ReadBytes(const base::FilePath& device_file_path,
+                         const scoped_refptr<net::IOBuffer>& buf,
+                         int64 offset,
+                         int buf_len,
+                         const ReadBytesSuccessCallback& success_callback,
+                         const ErrorCallback& error_callback) OVERRIDE;
   virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE;
 
   // The internal methods correspond to the similarly named methods above.

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h

@@ -50,11 +50,12 @@ class MTPDeviceDelegateImplMac : public MTPDeviceAsyncDelegate {
       const CreateSnapshotFileSuccessCallback& success_callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
-  virtual void ReadBytes(
-      const base::FilePath& device_file_path,
-      net::IOBuffer* buf, int64 offset, int buf_len,
-      const ReadBytesSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void ReadBytes(const base::FilePath& device_file_path,
+                         const scoped_refptr<net::IOBuffer>& buf,
+                         int64 offset,
+                         int buf_len,
+                         const ReadBytesSuccessCallback& success_callback,
+                         const ErrorCallback& error_callback) OVERRIDE;
   virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE;
 
   // Forward delegates for ImageCaptureDeviceListener. These are

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

@@ -201,7 +201,9 @@ bool MTPDeviceDelegateImplMac::IsStreaming() {
 
 void MTPDeviceDelegateImplMac::ReadBytes(
     const base::FilePath& device_file_path,
-    net::IOBuffer* buf, int64 offset, int buf_len,
+    const scoped_refptr<net::IOBuffer>& buf,
+    int64 offset,
+    int buf_len,
     const ReadBytesSuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   NOTREACHED();

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc

@@ -448,7 +448,9 @@ bool MTPDeviceDelegateImplWin::IsStreaming() {
 
 void MTPDeviceDelegateImplWin::ReadBytes(
     const base::FilePath& device_file_path,
-    net::IOBuffer* buf, int64 offset, int buf_len,
+    const scoped_refptr<net::IOBuffer>& buf,
+    int64 offset,
+    int buf_len,
     const ReadBytesSuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   NOTREACHED();

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h

@@ -104,11 +104,12 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
       const CreateSnapshotFileSuccessCallback& success_callback,
       const ErrorCallback& error_callback) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
-  virtual void ReadBytes(
-      const base::FilePath& device_file_path,
-      net::IOBuffer* buf, int64 offset, int buf_len,
-      const ReadBytesSuccessCallback& success_callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void ReadBytes(const base::FilePath& device_file_path,
+                         const scoped_refptr<net::IOBuffer>& buf,
+                         int64 offset,
+                         int buf_len,
+                         const ReadBytesSuccessCallback& success_callback,
+                         const ErrorCallback& error_callback) OVERRIDE;
   virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE;
 
   // Ensures the device is initialized for communication by doing a

chrome/utility/media_galleries/image_metadata_extractor.cc

@@ -28,10 +28,13 @@ namespace {
 
 const size_t kMaxBufferSize = 50 * 1024 * 1024;  // Arbitrary maximum of 50MB.
 
+typedef base::Callback<void(const scoped_refptr<net::DrainableIOBuffer>&)>
+    GotImageCallback;
+
 void FinishGetImageBytes(
-    net::DrainableIOBuffer* buffer,
+    const scoped_refptr<net::DrainableIOBuffer>& buffer,
     media::DataSource* source,
-    const base::Callback<void(net::DrainableIOBuffer*)>& callback,
+    const GotImageCallback& callback,
     int bytes_read) {
   if (bytes_read == media::DataSource::kReadError) {
     callback.Run(NULL);
@@ -41,20 +44,22 @@ void FinishGetImageBytes(
   buffer->DidConsume(bytes_read);
   // Didn't get the whole file. Continue reading to get the rest.
   if (buffer->BytesRemaining() > 0) {
-    source->Read(0, buffer->BytesRemaining(),
-                 reinterpret_cast<uint8*>(buffer->data()),
-                 base::Bind(&FinishGetImageBytes, make_scoped_refptr(buffer),
-                            base::Unretained(source), callback));
+    source->Read(
+        0,
+        buffer->BytesRemaining(),
+        reinterpret_cast<uint8*>(buffer->data()),
+        base::Bind(
+            &FinishGetImageBytes, buffer, base::Unretained(source), callback));
     return;
   }
 
   buffer->SetOffset(0);
-  callback.Run(make_scoped_refptr(buffer));
+  callback.Run(buffer);
 }
 
 void GetImageBytes(
     media::DataSource* source,
-    const base::Callback<void(net::DrainableIOBuffer*)>& callback) {
+    const GotImageCallback& callback) {
   int64 size64 = 0;
   if (!source->GetSize(&size64) ||
       base::saturated_cast<size_t>(size64) > kMaxBufferSize) {
@@ -383,8 +388,9 @@ int ImageMetadataExtractor::iso_equivalent() const {
 }
 
 void ImageMetadataExtractor::FinishExtraction(
-    const DoneCallback& callback, net::DrainableIOBuffer* buffer) {
-  if (!buffer) {
+    const DoneCallback& callback,
+    const scoped_refptr<net::DrainableIOBuffer>& buffer) {
+  if (!buffer.get()) {
     callback.Run(false);
     return;
   }

chrome/utility/media_galleries/image_metadata_extractor.h

@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/memory/ref_counted.h"
 
 namespace media {
 class DataSource;
@@ -64,7 +65,7 @@ class ImageMetadataExtractor {
  private:
   // Second half of the Extract method.
   void FinishExtraction(const DoneCallback& callback,
-                        net::DrainableIOBuffer* buffer);
+                        const scoped_refptr<net::DrainableIOBuffer>& buffer);
 
   bool extracted_;