| Index: content/renderer/browser_render_view_browsertest.cc
|
| diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc
|
| index dd7cc7ddb68034e2749891251728f58764b26534..2c12bc7a4788eee293d916c21a312015f28161c9 100644
|
| --- a/content/renderer/browser_render_view_browsertest.cc
|
| +++ b/content/renderer/browser_render_view_browsertest.cc
|
| @@ -49,13 +49,12 @@ class TestShellContentRendererClient : public ShellContentRendererClient {
|
| latest_error_reason_(0),
|
| latest_error_stale_copy_in_cache_(false) {}
|
|
|
| - virtual void GetNavigationErrorStrings(
|
| - content::RenderView* render_view,
|
| - blink::WebFrame* frame,
|
| - const blink::WebURLRequest& failed_request,
|
| - const blink::WebURLError& error,
|
| - std::string* error_html,
|
| - base::string16* error_description) override {
|
| + void GetNavigationErrorStrings(content::RenderView* render_view,
|
| + blink::WebFrame* frame,
|
| + const blink::WebURLRequest& failed_request,
|
| + const blink::WebURLError& error,
|
| + std::string* error_html,
|
| + base::string16* error_description) override {
|
| if (error_html)
|
| *error_html = "A suffusion of yellow.";
|
| latest_error_valid_ = true;
|
| @@ -138,13 +137,13 @@ class RenderViewBrowserTest : public ContentBrowserTest {
|
| public:
|
| RenderViewBrowserTest() {}
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| // This method is needed to allow interaction with in-process renderer
|
| // and use of a test ContentRendererClient.
|
| command_line->AppendSwitch(switches::kSingleProcess);
|
| }
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| // Override setting of renderer client.
|
| renderer_client_ = new TestShellContentRendererClient();
|
| // Explicitly leaks ownership; this object will remain alive
|
|
|