Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Side by Side Diff: content/test/web_contents_observer_sanity_checker.cc

Issue 2541063002: Revert of Remove about:srcdoc url conversion. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/frame_host/render_frame_host_impl.h" 9 #include "content/browser/frame_host/render_frame_host_impl.h"
10 #include "content/common/frame_messages.h" 10 #include "content/common/frame_messages.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 CHECK(!navigation_handle->HasCommitted() || 206 CHECK(!navigation_handle->HasCommitted() ||
207 navigation_handle->GetRenderFrameHost() != nullptr); 207 navigation_handle->GetRenderFrameHost() != nullptr);
208 208
209 ongoing_navigations_.erase(navigation_handle); 209 ongoing_navigations_.erase(navigation_handle);
210 } 210 }
211 211
212 void WebContentsObserverSanityChecker::DidStartProvisionalLoadForFrame( 212 void WebContentsObserverSanityChecker::DidStartProvisionalLoadForFrame(
213 RenderFrameHost* render_frame_host, 213 RenderFrameHost* render_frame_host,
214 const GURL& validated_url, 214 const GURL& validated_url,
215 bool is_error_page) { 215 bool is_error_page,
216 bool is_iframe_srcdoc) {
216 AssertRenderFrameExists(render_frame_host); 217 AssertRenderFrameExists(render_frame_host);
217 } 218 }
218 219
219 void WebContentsObserverSanityChecker::DidCommitProvisionalLoadForFrame( 220 void WebContentsObserverSanityChecker::DidCommitProvisionalLoadForFrame(
220 RenderFrameHost* render_frame_host, 221 RenderFrameHost* render_frame_host,
221 const GURL& url, 222 const GURL& url,
222 ui::PageTransition transition_type) { 223 ui::PageTransition transition_type) {
223 AssertRenderFrameExists(render_frame_host); 224 AssertRenderFrameExists(render_frame_host);
224 } 225 }
225 226
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 if (live_routes_.count(entry.first)) 407 if (live_routes_.count(entry.first))
407 return true; 408 return true;
408 if (current_hosts_.count(entry.first)) 409 if (current_hosts_.count(entry.first))
409 return true; 410 return true;
410 } 411 }
411 } 412 }
412 return false; 413 return false;
413 } 414 }
414 415
415 } // namespace content 416 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698