Index: content/renderer/render_view_impl.h |
=================================================================== |
--- content/renderer/render_view_impl.h (revision 196206) |
+++ content/renderer/render_view_impl.h (working copy) |
@@ -535,7 +535,7 @@ |
const WebKit::WebString& suggested_name); |
virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( |
WebKit::WebFrame* frame, |
- WebKit::WebDataSource* dataSource, |
+ WebKit::WebDataSource::ExtraData* extraData, |
const WebKit::WebURLRequest& request, |
WebKit::WebNavigationType type, |
WebKit::WebNavigationPolicy default_policy, |
@@ -827,6 +827,10 @@ |
FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, DecideNavigationPolicyForWebUI); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
+ DidFailProvisionalLoadWithErrorForError); |
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
+ DidFailProvisionalLoadWithErrorForCancellation); |
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
DontIgnoreBackAfterNavEntryLimit); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ImeComposition); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, InsertCharacters); |