Index: content/shell/renderer/test_runner/test_runner.cc |
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc |
index 523cfbf94112c5d3fcf3b9ff34a73b66e564f384..2d57878ba5f7a743b31058032fc775ae2b489678 100644 |
--- a/content/shell/renderer/test_runner/test_runner.cc |
+++ b/content/shell/renderer/test_runner/test_runner.cc |
@@ -290,8 +290,6 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> { |
void RemoveWebPageOverlay(); |
void LayoutAndPaintAsync(); |
void LayoutAndPaintAsyncThen(v8::Local<v8::Function> callback); |
- void DisplayAsync(); |
- void DisplayAsyncThen(v8::Local<v8::Function> callback); |
void GetManifestThen(v8::Local<v8::Function> callback); |
void CapturePixelsAsyncThen(v8::Local<v8::Function> callback); |
void CopyImageAtAndCapturePixelsAsyncThen(int x, |
@@ -539,8 +537,6 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder( |
&TestRunnerBindings::LayoutAndPaintAsync) |
.SetMethod("layoutAndPaintAsyncThen", |
&TestRunnerBindings::LayoutAndPaintAsyncThen) |
- .SetMethod("displayAsync", &TestRunnerBindings::DisplayAsync) |
- .SetMethod("displayAsyncThen", &TestRunnerBindings::DisplayAsyncThen) |
.SetMethod("getManifestThen", &TestRunnerBindings::GetManifestThen) |
.SetMethod("capturePixelsAsyncThen", |
&TestRunnerBindings::CapturePixelsAsyncThen) |
@@ -1374,17 +1370,6 @@ void TestRunnerBindings::LayoutAndPaintAsyncThen( |
runner_->LayoutAndPaintAsyncThen(callback); |
} |
-void TestRunnerBindings::DisplayAsync() { |
- if (runner_) |
- runner_->DisplayAsync(); |
-} |
- |
-void TestRunnerBindings::DisplayAsyncThen( |
- v8::Local<v8::Function> callback) { |
- if (runner_) |
- runner_->DisplayAsyncThen(callback); |
-} |
- |
void TestRunnerBindings::GetManifestThen(v8::Local<v8::Function> callback) { |
if (runner_) |
runner_->GetManifestThen(callback); |
@@ -2877,18 +2862,6 @@ void TestRunner::LayoutAndPaintAsyncThen(v8::Local<v8::Function> callback) { |
base::Passed(&task))); |
} |
-void TestRunner::DisplayAsync() { |
- proxy_->DisplayAsyncThen(base::Closure()); |
-} |
- |
-void TestRunner::DisplayAsyncThen(v8::Local<v8::Function> callback) { |
- scoped_ptr<InvokeCallbackTask> task( |
- new InvokeCallbackTask(this, callback)); |
- proxy_->DisplayAsyncThen(base::Bind(&TestRunner::InvokeCallback, |
- weak_factory_.GetWeakPtr(), |
- base::Passed(&task))); |
-} |
- |
void TestRunner::GetManifestThen(v8::Local<v8::Function> callback) { |
scoped_ptr<InvokeCallbackTask> task( |
new InvokeCallbackTask(this, callback)); |