| Index: content/shell/browser/webkit_test_controller.h
|
| diff --git a/content/shell/browser/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h
|
| index f47a277a636d5caf762576f999cf240d253168b5..925a20838fe8ecf694995d14a6ede22fc5f17594 100644
|
| --- a/content/shell/browser/webkit_test_controller.h
|
| +++ b/content/shell/browser/webkit_test_controller.h
|
| @@ -106,7 +106,7 @@ class WebKitTestController : public base::NonThreadSafe,
|
| static WebKitTestController* Get();
|
|
|
| WebKitTestController();
|
| - virtual ~WebKitTestController();
|
| + ~WebKitTestController() override;
|
|
|
| // True if the controller is ready for testing.
|
| bool PrepareForLayoutTest(const GURL& test_url,
|
| @@ -132,20 +132,20 @@ class WebKitTestController : public base::NonThreadSafe,
|
| void DevToolsProcessCrashed();
|
|
|
| // WebContentsObserver implementation.
|
| - virtual bool OnMessageReceived(const IPC::Message& message) override;
|
| - virtual void PluginCrashed(const base::FilePath& plugin_path,
|
| - base::ProcessId plugin_pid) override;
|
| - virtual void RenderViewCreated(RenderViewHost* render_view_host) override;
|
| - virtual void RenderProcessGone(base::TerminationStatus status) override;
|
| - virtual void WebContentsDestroyed() override;
|
| + bool OnMessageReceived(const IPC::Message& message) override;
|
| + void PluginCrashed(const base::FilePath& plugin_path,
|
| + base::ProcessId plugin_pid) override;
|
| + void RenderViewCreated(RenderViewHost* render_view_host) override;
|
| + void RenderProcessGone(base::TerminationStatus status) override;
|
| + void WebContentsDestroyed() override;
|
|
|
| // NotificationObserver implementation.
|
| - virtual void Observe(int type,
|
| - const NotificationSource& source,
|
| - const NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const NotificationSource& source,
|
| + const NotificationDetails& details) override;
|
|
|
| // GpuDataManagerObserver implementation.
|
| - virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
|
| + void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
|
|
|
| private:
|
| enum TestPhase {
|
|
|