| Index: content/test/test_render_view_host.h
|
| diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
|
| index d9438de9c02af97a125c6c59e5e4ccfad4c21bca..dd11ec40faf4ee6dcfb46a0c2fde747a95aed69f 100644
|
| --- a/content/test/test_render_view_host.h
|
| +++ b/content/test/test_render_view_host.h
|
| @@ -211,18 +211,9 @@ class TestRenderViewHost
|
| // RenderViewHostTester implementation. Note that CreateRenderView
|
| // is not specified since it is synonymous with the one from
|
| // RenderViewHostImpl, see below.
|
| - virtual void SetContentsMimeType(const std::string& mime_type) override;
|
| virtual void SimulateWasHidden() override;
|
| virtual void SimulateWasShown() override;
|
|
|
| - // NOTE: These methods are deprecated and the equivalents in
|
| - // TestRenderFrameHost should be used.
|
| - virtual void SendNavigate(int page_id, const GURL& url) override;
|
| - virtual void SendFailedNavigate(int page_id, const GURL& url) override;
|
| - virtual void SendNavigateWithTransition(
|
| - int page_id,
|
| - const GURL& url,
|
| - ui::PageTransition transition) override;
|
|
|
| // Calls OnNavigate on the RenderViewHost with the given information,
|
| // including a custom original request URL. Sets the rest of the
|
| @@ -318,9 +309,6 @@ class TestRenderViewHost
|
| // See set_simulate_history_list_was_cleared() above.
|
| bool simulate_history_list_was_cleared_;
|
|
|
| - // See SetContentsMimeType() above.
|
| - std::string contents_mime_type_;
|
| -
|
| // See opener_route_id() above.
|
| int opener_route_id_;
|
|
|
|
|