Revert 111040 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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_mac.h"
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/common/gpu/gpu_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/test/cocoa_test_event_utils.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
 using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class RenderWidgetHostViewMacTest : public RenderViewHostTestHarness {
  public:
@@ skipping 30 matching lines @@
   gfx::PluginWindowHandle AddAcceleratedPluginView(int w, int h) {
     // Create an accelerated view the size of the rhwvmac.
     [rwhv_cocoa_.get() setFrame:NSMakeRect(0, 0, w, h)];
     gfx::PluginWindowHandle accelerated_handle =
         rwhv_mac_->AllocateFakePluginWindowHandle(/*opaque=*/false,
                                                   /*root=*/false);
     rwhv_mac_->AcceleratedSurfaceSetIOSurface(accelerated_handle, w, h, 0);
 
     // The accelerated view isn't shown until it has a valid rect and has been
     // painted to.
-    GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-    params.window = accelerated_handle;
-    rwhv_mac_->AcceleratedSurfaceBuffersSwapped(params, 0);
+    rwhv_mac_->AcceleratedSurfaceBuffersSwapped(accelerated_handle,
+                                                0, 0, 0, 0);
     webkit::npapi::WebPluginGeometry geom;
     gfx::Rect rect(0, 0, w, h);
     geom.window = accelerated_handle;
     geom.window_rect = rect;
     geom.clip_rect = rect;
     geom.visible = true;
     geom.rects_valid = true;
     rwhv_mac_->MovePluginWindows(
         std::vector<webkit::npapi::WebPluginGeometry>(1, geom));
 
@@ skipping 118 matching lines @@
 
   // A click on the accelerated view should focus the RWHVCocoa.
   std::pair<NSEvent*, NSEvent*> clicks =
       cocoa_test_event_utils::MouseClickInView(accelerated_view, 1);
   [rwhv_cocoa_.get() mouseDown:clicks.first];
   EXPECT_EQ(rwhv_cocoa_.get(), [window firstResponder]);
 
   // Clean up.
   rwhv_mac_->DestroyFakePluginWindowHandle(accelerated_handle);
 }