Index: chrome/browser/extensions/extension_webnavigation_unittest.cc |
diff --git a/chrome/browser/extensions/extension_webnavigation_unittest.cc b/chrome/browser/extensions/extension_webnavigation_unittest.cc |
index ba9456649552c329844ac1f787197156fe5465e8..71d76ea7f9d5e8525b6996ce9f1ee99e3b85fcdb 100644 |
--- a/chrome/browser/extensions/extension_webnavigation_unittest.cc |
+++ b/chrome/browser/extensions/extension_webnavigation_unittest.cc |
@@ -12,7 +12,6 @@ |
#include "chrome/browser/extensions/extension_webnavigation_api.h" |
#include "chrome/browser/renderer_host/test/test_render_view_host.h" |
#include "chrome/browser/tab_contents/test_tab_contents.h" |
-#include "chrome/common/url_constants.h" |
#include "chrome/test/testing_profile.h" |
@@ -30,12 +29,12 @@ TEST_F(FrameNavigationStateTest, TrackFrame) { |
// Create a main frame. |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id1)); |
- navigation_state.TrackFrame(frame_id1, url1, true, contents()); |
+ navigation_state.TrackFrame(frame_id1, url1, true, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1)); |
// Add a sub frame. |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2)); |
- navigation_state.TrackFrame(frame_id2, url2, false, contents()); |
+ navigation_state.TrackFrame(frame_id2, url2, false, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2)); |
// Check frame state. |
@@ -58,20 +57,19 @@ TEST_F(FrameNavigationStateTest, ErrorState) { |
const int64 frame_id = 42; |
const GURL url("http://www.google.com/"); |
- navigation_state.TrackFrame(frame_id, url, true, contents()); |
+ navigation_state.TrackFrame(frame_id, url, true, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id)); |
// After an error occurred, no further events should be sent. |
navigation_state.ErrorOccurredInFrame(frame_id); |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id)); |
- // Navigations to the "unreachable web data" URL should be ignored. |
- navigation_state.TrackFrame( |
- frame_id, GURL(chrome::kUnreachableWebDataURL), true, contents()); |
+ // Navigations to a network error page should be ignored. |
+ navigation_state.TrackFrame(frame_id, GURL(), true, true, contents()); |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id)); |
// However, when the frame navigates again, it should send events again. |
- navigation_state.TrackFrame(frame_id, url, true, contents()); |
+ navigation_state.TrackFrame(frame_id, url, true, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id)); |
} |
@@ -83,8 +81,8 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) { |
const int64 frame_id2 = 42; |
const GURL url("http://www.google.com/"); |
- navigation_state.TrackFrame(frame_id1, url, true, contents()); |
- navigation_state.TrackFrame(frame_id2, url, false, contents()); |
+ navigation_state.TrackFrame(frame_id1, url, true, false, contents()); |
+ navigation_state.TrackFrame(frame_id2, url, false, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1)); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2)); |
@@ -93,14 +91,13 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) { |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1)); |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2)); |
- // Navigations to the "unreachable web data" URL should be ignored. |
- navigation_state.TrackFrame( |
- frame_id2, GURL(chrome::kUnreachableWebDataURL), false, contents()); |
+ // Navigations to a network error page should be ignored. |
+ navigation_state.TrackFrame(frame_id2, GURL(), false, true, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1)); |
EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2)); |
// However, when the frame navigates again, it should send events again. |
- navigation_state.TrackFrame(frame_id2, url, false, contents()); |
+ navigation_state.TrackFrame(frame_id2, url, false, false, contents()); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1)); |
EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2)); |
} |