Revert 115441 - Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped...

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 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 "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 163 matching lines @@
       case WM_MBUTTONDOWN:
         ::SendMessage(GetParent(window), message, wparam, lparam);
         return 0;
       default:
         break;
     }
   }
   return ::DefWindowProc(window, message, wparam, lparam);
 }
 
-void SendToGpuProcessHost(int gpu_host_id, scoped_ptr<IPC::Message> message) {
+void SendToGpuProcessHost(int gpu_host_id, IPC::Message* m) {
+  // TODO(ajwong): Switch back to Passed() when it becomes available again.
+  scoped_ptr<IPC::Message> message(m);
+
   GpuProcessHost* gpu_process_host = GpuProcessHost::FromID(gpu_host_id);
   if (!gpu_process_host)
     return;
 
   gpu_process_host->Send(message.release());
 }
 
 void PostTaskOnIOThread(const tracked_objects::Location& from_here,
                         base::Closure task) {
   BrowserThread::PostTask(BrowserThread::IO, from_here, task);
@@ skipping 1843 matching lines @@
 
 void RenderWidgetHostViewWin::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
   if (params.surface_id) {
     if (!accelerated_surface_.get() && compositor_host_window_) {
       accelerated_surface_ = new AcceleratedSurface(compositor_host_window_);
       accelerated_surface_->Initialize();
     }
 
-    scoped_ptr<IPC::Message> message(
-        new AcceleratedSurfaceMsg_BuffersSwappedACK(params.route_id));
     base::Closure acknowledge_task = base::Bind(
         SendToGpuProcessHost,
         gpu_host_id,
-        base::Passed(&message));
+        new AcceleratedSurfaceMsg_BuffersSwappedACK(params.route_id));
 
     accelerated_surface_->AsyncPresentAndAcknowledge(
         params.size,
         params.surface_id,
         base::Bind(PostTaskOnIOThread,
                    FROM_HERE,
                    acknowledge_task));
   } else {
     RenderWidgetHost::AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
   }
@@ skipping 425 matching lines @@
 
   size_t offset = selection_range_.GetMin() - selection_text_offset_;
   memcpy(reinterpret_cast<char*>(reconv) + sizeof(RECONVERTSTRING),
          selection_text_.c_str() + offset, len * sizeof(WCHAR));
 
   // According to Microsft API document, IMR_RECONVERTSTRING and
   // IMR_DOCUMENTFEED should return reconv, but some applications return
   // need_size.
   return reinterpret_cast<LRESULT>(reconv);
 }