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 9facecf6d984b8ded3b4eee14c8ff67332bdba2b..f4c7f7062f692a2fe9149decff2cc19b76f2658c 100644 |
--- a/content/shell/renderer/test_runner/web_test_proxy.h |
+++ b/content/shell/renderer/test_runner/web_test_proxy.h |
@@ -15,6 +15,7 @@ |
#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/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" |
@@ -75,6 +76,7 @@ typedef unsigned WebColor; |
namespace content { |
+class MockScreenOrientationClient; |
class MockWebPushClient; |
class MockWebSpeechRecognizer; |
class MockWebUserMediaClient; |
@@ -125,6 +127,8 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { |
void DisplayAsyncThen(const base::Closure& callback); |
+ void GetScreenOrientationForTesting(blink::WebScreenInfo&); |
+ MockScreenOrientationClient* GetScreenOrientationClientMock(); |
blink::WebMIDIClientMock* GetMIDIClientMock(); |
MockWebSpeechRecognizer* GetSpeechRecognizerMock(); |
@@ -269,6 +273,7 @@ class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback { |
scoped_ptr<blink::WebMIDIClientMock> midi_client_; |
scoped_ptr<MockWebSpeechRecognizer> speech_recognizer_; |
scoped_ptr<MockWebPushClient> push_client_; |
+ scoped_ptr<MockScreenOrientationClient> screen_orientation_client_; |
std::string accept_languages_; |
@@ -299,6 +304,13 @@ class WebTestProxy : public Base, public WebTestProxyBase { |
virtual ~WebTestProxy() {} |
+ // WebWidgetClient implementation. |
+ virtual blink::WebScreenInfo screenInfo() { |
+ blink::WebScreenInfo info = Base::screenInfo(); |
+ WebTestProxyBase::GetScreenOrientationForTesting(info); |
+ return info; |
+ } |
+ |
// WebViewClient implementation. |
virtual void scheduleAnimation() { WebTestProxyBase::ScheduleAnimation(); } |
virtual void postAccessibilityEvent(const blink::WebAXObject& object, |