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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
index 83eb6c1ff7e8ccf1faaa84175892b5fbfaef7b02..c39357c9100fd1c9e572725b4308f0c9245eeaf1 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc
@@ -39,8 +39,7 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {
// Create a main frame.
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.IsValidFrame(main_rfh()));
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -49,8 +48,7 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_FALSE(navigation_state_.IsValidFrame(sub_frame));
- navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_TRUE(navigation_state_.IsValidFrame(sub_frame));
@@ -73,8 +71,7 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {
TEST_F(FrameNavigationStateTest, ErrorState) {
const GURL url("http://www.google.com/");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
@@ -84,14 +81,12 @@ TEST_F(FrameNavigationStateTest, ErrorState) {
EXPECT_TRUE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), GURL(), false, true,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), GURL(), false, true);
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
// However, when the frame navigates again, it should send events again.
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
}
@@ -103,10 +98,8 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
- false);
- navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
@@ -116,14 +109,12 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingDocumentLoad(sub_frame, GURL(), false, true,
- false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, GURL(), false, true);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
// However, when the frame navigates again, it should send events again.
- navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
}
@@ -132,8 +123,7 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
TEST_F(FrameNavigationStateTest, WebSafeScheme) {
const GURL url("unsafe://www.google.com/");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
}
@@ -145,10 +135,9 @@ TEST_F(FrameNavigationStateTest, SrcDoc) {
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
- false);
- navigation_state_.StartTrackingDocumentLoad(sub_frame, blank, false, false,
- true);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, srcdoc, false, false);
+
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
@@ -166,8 +155,7 @@ TEST_F(FrameNavigationStateTest, DetachFrame) {
// Create a main frame.
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.IsValidFrame(main_rfh()));
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -176,8 +164,7 @@ TEST_F(FrameNavigationStateTest, DetachFrame) {
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_FALSE(navigation_state_.IsValidFrame(sub_frame));
- navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false,
- false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false);
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_TRUE(navigation_state_.IsValidFrame(sub_frame));
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698