Draw page popups in layout tests

content/shell/renderer/test_runner/web_test_proxy.h

 // Copyright 2014 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_WEB_TEST_PROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_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/web_task.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"

[tkent, 2014/09/18 06:01:29]

Move this line to .cc.

[keishi, 2014/09/18 09:14:17]

Done.

 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
@@ skipping 59 matching lines @@
 class SpellCheckClient;
 class TestInterfaces;
 class WebTestDelegate;
 class WebTestInterfaces;
 
 // WebTestProxyBase is the "brain" of WebTestProxy in the sense that
 // WebTestProxy does the bridge between RenderViewImpl and WebTestProxyBase and
 // 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);
   void set_widget(blink::WebWidget* widget) { web_widget_ = widget; }
 
   void Reset();
 
   blink::WebSpellCheckClient* GetSpellCheckClient() const;
   blink::WebColorChooser* CreateColorChooser(
       blink::WebColorChooserClient* client,
@@ skipping 27 matching lines @@
   blink::WebMIDIClientMock* GetMIDIClientMock();
   MockWebSpeechRecognizer* GetSpeechRecognizerMock();
   MockCredentialManagerClient* GetCredentialManagerClientMock();
 
   WebTaskList* mutable_task_list() { return &task_list_; }
 
   blink::WebView* GetWebView() const;
 
   void PostSpellCheckEvent(const blink::WebString& event_name);
 
-  // WebCompositeAndReadbackAsyncCallback implementation.
-  virtual void didCompositeAndReadback(const SkBitmap& bitmap);
-
   void SetAcceptLanguages(const std::string& accept_languages);
 
   MockWebPushClient* GetPushClientMock();
 
  protected:
   WebTestProxyBase();
   ~WebTestProxyBase();
 
   void ScheduleAnimation();
   void PostAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent);
@@ skipping 104 matching lines @@
   WebTestDelegate* delegate_;
   blink::WebWidget* web_widget_;
 
   WebTaskList task_list_;
 
   scoped_ptr<SpellCheckClient> spellcheck_;
   scoped_ptr<MockWebUserMediaClient> user_media_client_;
 
   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_;
 
   scoped_ptr<MockCredentialManagerClient> credential_manager_client_;
   scoped_ptr<blink::WebMIDIClientMock> midi_client_;
   scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_;
   scoped_ptr<MockWebPushClient> push_client_;
   scoped_ptr<MockScreenOrientationClient> screen_orientation_client_;
 
@@ skipping 124 matching lines @@
     return WebTestProxyBase::GetWebPushClient();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_