| Index: content/shell/renderer/test_runner/WebTestProxy.cpp
|
| diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
|
| index 1d611724436de6b4a8754d309796a81a1ec93ee2..31d9009aa259bc30d0d2a342ef0dc0b4a290512c 100644
|
| --- a/content/shell/renderer/test_runner/WebTestProxy.cpp
|
| +++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
|
| @@ -15,11 +15,11 @@
|
| #include "content/shell/renderer/test_runner/TestCommon.h"
|
| #include "content/shell/renderer/test_runner/TestInterfaces.h"
|
| #include "content/shell/renderer/test_runner/TestPlugin.h"
|
| -#include "content/shell/renderer/test_runner/TestRunner.h"
|
| #include "content/shell/renderer/test_runner/WebTestDelegate.h"
|
| #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
|
| #include "content/shell/renderer/test_runner/WebTestRunner.h"
|
| #include "content/shell/renderer/test_runner/WebUserMediaClientMock.h"
|
| +#include "content/shell/renderer/test_runner/test_runner.h"
|
| // FIXME: Including platform_canvas.h here is a layering violation.
|
| #include "skia/ext/platform_canvas.h"
|
| #include "third_party/WebKit/public/platform/WebCString.h"
|
| @@ -717,7 +717,7 @@ void WebTestProxyBase::scheduleComposite()
|
|
|
| void WebTestProxyBase::scheduleAnimation()
|
| {
|
| - if (!m_testInterfaces->testRunner()->testIsRunning())
|
| + if (!m_testInterfaces->testRunner()->TestIsRunning())
|
| return;
|
|
|
| if (!m_animateScheduled) {
|
| @@ -976,12 +976,12 @@ WebSpeechRecognizer* WebTestProxyBase::speechRecognizer()
|
|
|
| bool WebTestProxyBase::requestPointerLock()
|
| {
|
| - return m_testInterfaces->testRunner()->requestPointerLock();
|
| + return m_testInterfaces->testRunner()->RequestPointerLock();
|
| }
|
|
|
| void WebTestProxyBase::requestPointerUnlock()
|
| {
|
| - m_testInterfaces->testRunner()->requestPointerUnlock();
|
| + m_testInterfaces->testRunner()->RequestPointerUnlock();
|
| }
|
|
|
| bool WebTestProxyBase::isPointerLocked()
|
|
|