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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.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 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 c39357c9100fd1c9e572725b4308f0c9245eeaf1..83eb6c1ff7e8ccf1faaa84175892b5fbfaef7b02 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,7 +39,8 @@
// 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);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -48,7 +49,8 @@
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);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_TRUE(navigation_state_.IsValidFrame(sub_frame));
@@ -71,7 +73,8 @@
TEST_F(FrameNavigationStateTest, ErrorState) {
const GURL url("http://www.google.com/");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
@@ -81,12 +84,14 @@
EXPECT_TRUE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), GURL(), false, true);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), GURL(), false, true,
+ false);
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);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
}
@@ -98,8 +103,10 @@
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
- navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
@@ -109,12 +116,14 @@
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingDocumentLoad(sub_frame, GURL(), false, true);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, GURL(), false, true,
+ false);
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);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
}
@@ -123,7 +132,8 @@
TEST_F(FrameNavigationStateTest, WebSafeScheme) {
const GURL url("unsafe://www.google.com/");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
}
@@ -135,9 +145,10 @@
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false);
- navigation_state_.StartTrackingDocumentLoad(sub_frame, srcdoc, false, false);
-
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, blank, false, false,
+ true);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
@@ -155,7 +166,8 @@
// 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);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -164,7 +176,8 @@
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);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, 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