Make displayAsyncThen use the CompositeAndReadbackAsync path.

content/shell/renderer/test_runner/WebTestProxy.h

 // Copyright 2013 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 CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 
+#include <deque>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/shell/renderer/test_runner/WebTask.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
@@ skipping 84 matching lines @@
 
     void setLogConsoleOutput(bool enabled);
 
     // FIXME: Make this private again.
     void scheduleComposite();
 
     void didOpenChooser();
     void didCloseChooser();
     bool isChooserShown();
 
-    void display(base::Closure callback);
     void displayAsyncThen(base::Closure callback);
 
     void discardBackingStore();
 
     blink::WebMIDIClientMock* midiClientMock();
     MockWebSpeechRecognizer* speechRecognizerMock();
 
     WebTaskList* taskList() { return &m_taskList; }
 
     blink::WebView* webView();
@@ skipping 65 matching lines @@
 private:
     template<class, typename, typename> friend class WebFrameTestProxy;
     void locationChangeDone(blink::WebFrame*);
     void paintRect(const blink::WebRect&);
     void paintInvalidatedRegion();
     void paintPagesWithBoundaries();
     SkCanvas* canvas();
     void invalidateAll();
     void animateNow();
     void DrawSelectionRect(SkCanvas* canvas);
+    void DisplayForSoftwareMode(const base::Closure& callback);
+    void DidDisplayAsync(const base::Closure& callback, const SkBitmap& bitmap);
 
     blink::WebWidget* webWidget();
 
     TestInterfaces* m_testInterfaces;
     WebTestDelegate* m_delegate;
     blink::WebWidget* m_webWidget;
 
     WebTaskList m_taskList;
 
     scoped_ptr<SpellCheckClient> m_spellcheck;
     scoped_ptr<WebUserMediaClientMock> m_userMediaClient;
 
     // Painting.
     scoped_ptr<SkCanvas> m_canvas;
     blink::WebRect m_paintRect;
     bool m_isPainting;
     bool m_animateScheduled;
     std::map<unsigned, std::string> m_resourceIdentifierMap;
     std::map<unsigned, blink::WebURLRequest> m_requestMap;
-    base::Callback<void(const SkBitmap&)> m_compositeAndReadbackCallback;
+    std::deque<base::Callback<void(const SkBitmap&)> >
+        m_compositeAndReadbackCallbacks;
 
     bool m_logConsoleOutput;
     int m_chooserCount;
 
     scoped_ptr<blink::WebMIDIClientMock> m_midiClient;
     scoped_ptr<MockWebSpeechRecognizer> m_speechRecognizer;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
 };
@@ skipping 140 matching lines @@
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_