chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc - Issue 10790141: Revert "Revert 148074 - Pass the render process id to the FrameNavigationState."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10790141: Revert "Revert 148074 - Pass the render process id to the FrameNavigationState." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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') | 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 3b822344f79ba290a7104122cd92dfb62268622e..8d0d54558242b910527faf333612bddc8ce82ac7 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

@@ -17,8 +17,8 @@ class FrameNavigationStateTest : public ChromeRenderViewHostTestHarness {

// goes away.

TEST_F(FrameNavigationStateTest, TrackFrame) {

FrameNavigationState navigation_state;

- const int64 frame_id1 = 23;

- const int64 frame_id2 = 42;

+ const FrameNavigationState::FrameID frame_id1(23, 1);

+ const FrameNavigationState::FrameID frame_id2(42, 1);

const GURL url1("http://www.google.com/");

const GURL url2("http://mail.google.com/");

@@ -48,7 +48,7 @@ TEST_F(FrameNavigationStateTest, TrackFrame) {

// before a new navigation happened in this frame.

TEST_F(FrameNavigationStateTest, ErrorState) {

FrameNavigationState navigation_state;

- const int64 frame_id = 42;

+ const FrameNavigationState::FrameID frame_id(42, 1);

const GURL url("http://www.google.com/");

navigation_state.TrackFrame(frame_id, url, true, false);

@@ -75,8 +75,8 @@ TEST_F(FrameNavigationStateTest, ErrorState) {

// before a new navigation happened in this frame.

TEST_F(FrameNavigationStateTest, ErrorStateFrame) {

FrameNavigationState navigation_state;

- const int64 frame_id1 = 23;

- const int64 frame_id2 = 42;

+ const FrameNavigationState::FrameID frame_id1(23, 1);

+ const FrameNavigationState::FrameID frame_id2(42, 1);

const GURL url("http://www.google.com/");

navigation_state.TrackFrame(frame_id1, url, true, false);

@@ -103,7 +103,7 @@ TEST_F(FrameNavigationStateTest, ErrorStateFrame) {

// Tests that no events are send for a not web-safe scheme.

TEST_F(FrameNavigationStateTest, WebSafeScheme) {

FrameNavigationState navigation_state;

- const int64 frame_id = 23;

+ const FrameNavigationState::FrameID frame_id(23, 1);

const GURL url("unsafe://www.google.com/");

navigation_state.TrackFrame(frame_id, url, true, false);