Refactor how surfaces are acquired for GPU compositing.

chrome/browser/renderer_host/test/test_render_view_host.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
@@ skipping 110 matching lines @@
       int32 height,
       TransportDIB::Handle transport_dib);
   virtual void AcceleratedSurfaceBuffersSwapped(
       gfx::PluginWindowHandle window,
       uint64 surface_id,
       int renderer_id,
       int32 route_id,
       uint64 swap_buffers_count);
   virtual void GpuRenderingStateDidChange();
 #elif defined(OS_WIN)
-  virtual gfx::PluginWindowHandle GetCompositorHostWindow();
   virtual void WillWmDestroy();
   virtual void ShowCompositorHostWindow(bool show);
 #endif
   virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) { }
 
 #if defined(TOOLKIT_USES_GTK)
   virtual void CreatePluginContainer(gfx::PluginWindowHandle id) { }
   virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) { }
   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 {
     return false;
   }
 
   bool is_showing() const { return is_showing_; }
 
  private:
   RenderWidgetHost* rwh_;
   bool is_showing_;
 };
@@ skipping 138 matching lines @@
 
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
   scoped_ptr<TestTabContents> contents_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_