OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/test/web_contents_observer_sanity_checker.h" | 5 #include "content/test/web_contents_observer_sanity_checker.h" |
6 | 6 |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "content/browser/frame_host/render_frame_host_impl.h" | 8 #include "content/browser/frame_host/render_frame_host_impl.h" |
9 #include "content/common/frame_messages.h" | 9 #include "content/common/frame_messages.h" |
10 #include "content/public/browser/render_frame_host.h" | 10 #include "content/public/browser/render_frame_host.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 RenderFrameHost* render_frame_host, | 131 RenderFrameHost* render_frame_host, |
132 const GURL& url, | 132 const GURL& url, |
133 ui::PageTransition transition_type) { | 133 ui::PageTransition transition_type) { |
134 AssertRenderFrameExists(render_frame_host); | 134 AssertRenderFrameExists(render_frame_host); |
135 } | 135 } |
136 | 136 |
137 void WebContentsObserverSanityChecker::DidFailProvisionalLoad( | 137 void WebContentsObserverSanityChecker::DidFailProvisionalLoad( |
138 RenderFrameHost* render_frame_host, | 138 RenderFrameHost* render_frame_host, |
139 const GURL& validated_url, | 139 const GURL& validated_url, |
140 int error_code, | 140 int error_code, |
141 const base::string16& error_description) { | 141 const base::string16& error_description, |
| 142 bool was_ignored_by_handler) { |
142 AssertRenderFrameExists(render_frame_host); | 143 AssertRenderFrameExists(render_frame_host); |
143 } | 144 } |
144 | 145 |
145 void WebContentsObserverSanityChecker::DidNavigateMainFrame( | 146 void WebContentsObserverSanityChecker::DidNavigateMainFrame( |
146 const LoadCommittedDetails& details, | 147 const LoadCommittedDetails& details, |
147 const FrameNavigateParams& params) { | 148 const FrameNavigateParams& params) { |
148 AssertMainFrameExists(); | 149 AssertMainFrameExists(); |
149 } | 150 } |
150 | 151 |
151 void WebContentsObserverSanityChecker::DidNavigateAnyFrame( | 152 void WebContentsObserverSanityChecker::DidNavigateAnyFrame( |
(...skipping 19 matching lines...) Expand all Loading... |
171 void WebContentsObserverSanityChecker::DidFinishLoad( | 172 void WebContentsObserverSanityChecker::DidFinishLoad( |
172 RenderFrameHost* render_frame_host, | 173 RenderFrameHost* render_frame_host, |
173 const GURL& validated_url) { | 174 const GURL& validated_url) { |
174 AssertRenderFrameExists(render_frame_host); | 175 AssertRenderFrameExists(render_frame_host); |
175 } | 176 } |
176 | 177 |
177 void WebContentsObserverSanityChecker::DidFailLoad( | 178 void WebContentsObserverSanityChecker::DidFailLoad( |
178 RenderFrameHost* render_frame_host, | 179 RenderFrameHost* render_frame_host, |
179 const GURL& validated_url, | 180 const GURL& validated_url, |
180 int error_code, | 181 int error_code, |
181 const base::string16& error_description) { | 182 const base::string16& error_description, |
| 183 bool was_ignored_by_handler) { |
182 AssertRenderFrameExists(render_frame_host); | 184 AssertRenderFrameExists(render_frame_host); |
183 } | 185 } |
184 | 186 |
185 void WebContentsObserverSanityChecker::DidGetRedirectForResourceRequest( | 187 void WebContentsObserverSanityChecker::DidGetRedirectForResourceRequest( |
186 RenderFrameHost* render_frame_host, | 188 RenderFrameHost* render_frame_host, |
187 const ResourceRedirectDetails& details) { | 189 const ResourceRedirectDetails& details) { |
188 AssertRenderFrameExists(render_frame_host); | 190 AssertRenderFrameExists(render_frame_host); |
189 } | 191 } |
190 | 192 |
191 void WebContentsObserverSanityChecker::DidOpenRequestedURL( | 193 void WebContentsObserverSanityChecker::DidOpenRequestedURL( |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 | 260 |
259 std::string WebContentsObserverSanityChecker::Format( | 261 std::string WebContentsObserverSanityChecker::Format( |
260 RenderFrameHost* render_frame_host) { | 262 RenderFrameHost* render_frame_host) { |
261 return base::StringPrintf( | 263 return base::StringPrintf( |
262 "(%d, %d -> %s)", render_frame_host->GetProcess()->GetID(), | 264 "(%d, %d -> %s)", render_frame_host->GetProcess()->GetID(), |
263 render_frame_host->GetRoutingID(), | 265 render_frame_host->GetRoutingID(), |
264 render_frame_host->GetSiteInstance()->GetSiteURL().spec().c_str()); | 266 render_frame_host->GetSiteInstance()->GetSiteURL().spec().c_str()); |
265 } | 267 } |
266 | 268 |
267 } // namespace content | 269 } // namespace content |
OLD | NEW |