Draw page popups in layout tests

content/shell/renderer/test_runner/web_test_proxy.h

Index: content/shell/renderer/test_runner/web_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/content/shell/renderer/test_runner/web_test_proxy.h
index 60b68126a335ad8ec88798978ddb8e444dc414d3..379fc6798cdd15e905eb7cfcc1e73af0ce726859 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.h
+++ b/content/shell/renderer/test_runner/web_test_proxy.h
@@ -92,7 +92,7 @@ class WebTestInterfaces;
 // when it requires a behavior to be different from the usual, it will call
 // WebTestProxyBase that implements the expected behavior.
 // See WebTestProxy class comments for more information.
-class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
+class WebTestProxyBase {
  public:
   void SetInterfaces(WebTestInterfaces* interfaces);
   void SetDelegate(WebTestDelegate* delegate);
@@ -139,9 +139,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
 
   void PostSpellCheckEvent(const blink::WebString& event_name);
 
-  // WebCompositeAndReadbackAsyncCallback implementation.
-  virtual void didCompositeAndReadback(const SkBitmap& bitmap);
-
   void SetAcceptLanguages(const std::string& accept_languages);
 
   MockWebPushClient* GetPushClientMock();
@@ -266,8 +263,6 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
 
   bool animate_scheduled_;
   std::map<unsigned, std::string> resource_identifier_map_;
-  std::deque<base::Callback<void(const SkBitmap&)> >
-      composite_and_readback_callbacks_;
 
   bool log_console_output_;
   int chooser_count_;