| Index: content/shell/renderer/webkit_test_runner.cc
|
| diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
|
| index 4d21232489d6ae9ddb7c1797397eb0393c07bc8f..ea9946558bc28dda25d5102b4861867c81a8ff14 100644
|
| --- a/content/shell/renderer/webkit_test_runner.cc
|
| +++ b/content/shell/renderer/webkit_test_runner.cc
|
| @@ -33,8 +33,8 @@
|
| #include "content/shell/renderer/shell_render_process_observer.h"
|
| #include "content/shell/renderer/test_runner/WebTask.h"
|
| #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
|
| -#include "content/shell/renderer/test_runner/WebTestRunner.h"
|
| #include "content/shell/renderer/test_runner/web_test_proxy.h"
|
| +#include "content/shell/renderer/test_runner/web_test_runner.h"
|
| #include "net/base/filename_util.h"
|
| #include "net/base/net_errors.h"
|
| #include "skia/ext/platform_canvas.h"
|
| @@ -476,7 +476,7 @@ void WebKitTestRunner::testFinished() {
|
| WebTestInterfaces* interfaces =
|
| ShellRenderProcessObserver::GetInstance()->test_interfaces();
|
| interfaces->setTestIsRunning(false);
|
| - if (interfaces->testRunner()->shouldDumpBackForwardList()) {
|
| + if (interfaces->testRunner()->ShouldDumpBackForwardList()) {
|
| SyncNavigationStateVisitor visitor;
|
| RenderView::ForEach(&visitor);
|
| Send(new ShellViewHostMsg_CaptureSessionHistory(routing_id()));
|
| @@ -617,16 +617,16 @@ void WebKitTestRunner::CaptureDump() {
|
| ShellRenderProcessObserver::GetInstance()->test_interfaces();
|
| TRACE_EVENT0("shell", "WebKitTestRunner::CaptureDump");
|
|
|
| - if (interfaces->testRunner()->shouldDumpAsAudio()) {
|
| + if (interfaces->testRunner()->ShouldDumpAsAudio()) {
|
| std::vector<unsigned char> vector_data;
|
| - interfaces->testRunner()->getAudioData(&vector_data);
|
| + interfaces->testRunner()->GetAudioData(&vector_data);
|
| Send(new ShellViewHostMsg_AudioDump(routing_id(), vector_data));
|
| } else {
|
| Send(new ShellViewHostMsg_TextDump(routing_id(),
|
| proxy()->CaptureTree(false)));
|
|
|
| if (test_config_.enable_pixel_dumping &&
|
| - interfaces->testRunner()->shouldGeneratePixelResults()) {
|
| + interfaces->testRunner()->ShouldGeneratePixelResults()) {
|
| CHECK(render_view()->GetWebView()->isAcceleratedCompositingActive());
|
| proxy()->CapturePixelsAsync(base::Bind(
|
| &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
|
|
|