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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1670673003: Refactor the implementation of the webNavigation extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Bug-532666-NavigationHandleAPI
Patch Set: Remove UI thread DCHECKs. Created 4 years, 10 months 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.h » ('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 649547f81402614199acb3c70fcb6d269cba8a05..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,8 +39,8 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {
// Create a main frame.
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.IsValidFrame(main_rfh()));
- navigation_state_.StartTrackingNavigation(main_rfh(), url1, false, false);
- navigation_state_.SetNavigationCommitted(main_rfh());
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -49,8 +49,8 @@ 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_.StartTrackingNavigation(sub_frame, url2, false, false);
- navigation_state_.SetNavigationCommitted(sub_frame);
+ navigation_state_.StartTrackingDocumentLoad(sub_frame, url2, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(sub_frame));
EXPECT_TRUE(navigation_state_.IsValidFrame(sub_frame));
@@ -73,7 +73,8 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {
TEST_F(FrameNavigationStateTest, ErrorState) {
const GURL url("http://www.google.com/");
- navigation_state_.StartTrackingNavigation(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()));
@@ -83,12 +84,14 @@ TEST_F(FrameNavigationStateTest, ErrorState) {
EXPECT_TRUE(navigation_state_.GetErrorOccurredInFrame(main_rfh()));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingNavigation(main_rfh(), GURL(), true, false);
+ 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_.StartTrackingNavigation(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()));
}
@@ -100,8 +103,10 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingNavigation(main_rfh(), url, false, false);
- navigation_state_.StartTrackingNavigation(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));
@@ -111,12 +116,14 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
EXPECT_FALSE(navigation_state_.CanSendEvents(sub_frame));
// Navigations to a network error page should be ignored.
- navigation_state_.StartTrackingNavigation(sub_frame, GURL(), true, false);
+ 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_.StartTrackingNavigation(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));
}
@@ -125,7 +132,8 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
TEST_F(FrameNavigationStateTest, WebSafeScheme) {
const GURL url("unsafe://www.google.com/");
- navigation_state_.StartTrackingNavigation(main_rfh(), url, false, false);
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url, false, false,
+ false);
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
}
@@ -137,8 +145,10 @@ TEST_F(FrameNavigationStateTest, SrcDoc) {
content::RenderFrameHost* sub_frame =
content::RenderFrameHostTester::For(main_rfh())->AppendChild("child");
- navigation_state_.StartTrackingNavigation(main_rfh(), url, false, false);
- navigation_state_.StartTrackingNavigation(sub_frame, blank, false, true);
+ 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));
@@ -156,8 +166,8 @@ TEST_F(FrameNavigationStateTest, DetachFrame) {
// Create a main frame.
EXPECT_FALSE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_FALSE(navigation_state_.IsValidFrame(main_rfh()));
- navigation_state_.StartTrackingNavigation(main_rfh(), url1, false, false);
- navigation_state_.SetNavigationCommitted(main_rfh());
+ navigation_state_.StartTrackingDocumentLoad(main_rfh(), url1, false, false,
+ false);
EXPECT_TRUE(navigation_state_.CanSendEvents(main_rfh()));
EXPECT_TRUE(navigation_state_.IsValidFrame(main_rfh()));
@@ -166,8 +176,8 @@ 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_.StartTrackingNavigation(sub_frame, url2, false, false);
- navigation_state_.SetNavigationCommitted(sub_frame);
+ 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.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698