Refactor how surfaces are acquired for GPU compositing.

chrome/browser/renderer_host/test/test_render_view_host.h

Index: chrome/browser/renderer_host/test/test_render_view_host.h
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index dfc3d53d77f9f1a3f919a9700f280b4da41dc5c7..78afa0e6ecd0f691ad8d6bee5dd3a6167aaf4459 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -128,7 +128,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
       uint64 swap_buffers_count);
   virtual void GpuRenderingStateDidChange();
 #elif defined(OS_WIN)
-  virtual gfx::PluginWindowHandle GetCompositorHostWindow();
   virtual void WillWmDestroy();
   virtual void ShowCompositorHostWindow(bool show);
 #endif
@@ -140,6 +139,11 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
   virtual void AcceleratedCompositingActivated(bool activated) { }
 #endif
 
+  virtual gfx::PluginWindowHandle AcquireCompositingSurface() {
+    return gfx::kNullPluginWindow;
+  }
+  virtual void ReleaseCompositingSurface(gfx::PluginWindowHandle surface) { }
+
   virtual bool ContainsNativeView(gfx::NativeView native_view) const;
 
   bool is_showing() const { return is_showing_; }