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 a81439071e7453d5cc6946c9ce3eb421e06745b6..a477f401b7e56e32ca66e4afaf61193a0f9f6e90 100644 |
--- a/content/shell/renderer/test_runner/test_runner.cc |
+++ b/content/shell/renderer/test_runner/test_runner.cc |
@@ -74,7 +74,7 @@ class HostMethodTask : public WebMethodTask<TestRunner> { |
HostMethodTask(TestRunner* object, CallbackMethodType callback) |
: WebMethodTask<TestRunner>(object), callback_(callback) {} |
- virtual void RunIfValid() override { (object_->*callback_)(); } |
+ void RunIfValid() override { (object_->*callback_)(); } |
private: |
CallbackMethodType callback_; |
@@ -89,7 +89,7 @@ class InvokeCallbackTask : public WebMethodTask<TestRunner> { |
callback_(blink::mainThreadIsolate(), callback), |
argc_(0) {} |
- virtual void RunIfValid() override { |
+ void RunIfValid() override { |
v8::Isolate* isolate = blink::mainThreadIsolate(); |
v8::HandleScope handle_scope(isolate); |
WebFrame* frame = object_->web_view_->mainFrame(); |
@@ -138,10 +138,10 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> { |
private: |
explicit TestRunnerBindings( |
base::WeakPtr<TestRunner> controller); |
- virtual ~TestRunnerBindings(); |
+ ~TestRunnerBindings() override; |
// gin::Wrappable: |
- virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( |
+ gin::ObjectTemplateBuilder GetObjectTemplateBuilder( |
v8::Isolate* isolate) override; |
void LogToStderr(const std::string& output); |
@@ -1915,7 +1915,7 @@ class WorkItemBackForward : public TestRunner::WorkItem { |
public: |
WorkItemBackForward(int distance) : distance_(distance) {} |
- virtual bool Run(WebTestDelegate* delegate, WebView*) override { |
+ bool Run(WebTestDelegate* delegate, WebView*) override { |
delegate->GoToOffset(distance_); |
return true; // FIXME: Did it really start a navigation? |
} |
@@ -1948,7 +1948,7 @@ void TestRunner::QueueForwardNavigation(int how_far_forward) { |
class WorkItemReload : public TestRunner::WorkItem { |
public: |
- virtual bool Run(WebTestDelegate* delegate, WebView*) override { |
+ bool Run(WebTestDelegate* delegate, WebView*) override { |
delegate->Reload(); |
return true; |
} |
@@ -1963,7 +1963,7 @@ class WorkItemLoadingScript : public TestRunner::WorkItem { |
WorkItemLoadingScript(const std::string& script) |
: script_(script) {} |
- virtual bool Run(WebTestDelegate*, WebView* web_view) override { |
+ bool Run(WebTestDelegate*, WebView* web_view) override { |
web_view->mainFrame()->executeScript( |
WebScriptSource(WebString::fromUTF8(script_))); |
return true; // FIXME: Did it really start a navigation? |
@@ -1982,7 +1982,7 @@ class WorkItemNonLoadingScript : public TestRunner::WorkItem { |
WorkItemNonLoadingScript(const std::string& script) |
: script_(script) {} |
- virtual bool Run(WebTestDelegate*, WebView* web_view) override { |
+ bool Run(WebTestDelegate*, WebView* web_view) override { |
web_view->mainFrame()->executeScript( |
WebScriptSource(WebString::fromUTF8(script_))); |
return false; |
@@ -2001,7 +2001,7 @@ class WorkItemLoad : public TestRunner::WorkItem { |
WorkItemLoad(const WebURL& url, const std::string& target) |
: url_(url), target_(target) {} |
- virtual bool Run(WebTestDelegate* delegate, WebView*) override { |
+ bool Run(WebTestDelegate* delegate, WebView*) override { |
delegate->LoadURLForFrame(url_, target_); |
return true; // FIXME: Did it really start a navigation? |
} |
@@ -2027,7 +2027,7 @@ class WorkItemLoadHTMLString : public TestRunner::WorkItem { |
const WebURL& unreachable_url) |
: html_(html), base_url_(base_url), unreachable_url_(unreachable_url) {} |
- virtual bool Run(WebTestDelegate*, WebView* web_view) override { |
+ bool Run(WebTestDelegate*, WebView* web_view) override { |
web_view->mainFrame()->loadHTMLString( |
WebData(html_.data(), html_.length()), |
base_url_, unreachable_url_); |