content/browser/tab_contents/render_view_host_manager_unittest.cc - Issue 7541001: Move more files from chrome/test to chrome/test/base, part #3

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/tab_contents/render_view_host_manager_unittest.cc

Issue 7541001: Move more files from chrome/test to chrome/test/base, part #3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/browser/tab_contents/navigation_controller_unittest.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/test/test_notification_tracker.h"	5 #include "chrome/test/base/test_notification_tracker.h"

6 #include "chrome/test/testing_profile.h"	6 #include "chrome/test/testing_profile.h"

7 #include "content/browser/browser_thread.h"	7 #include "content/browser/browser_thread.h"

8 #include "content/browser/browser_url_handler.h"	8 #include "content/browser/browser_url_handler.h"

9 #include "content/browser/renderer_host/test_render_view_host.h"	9 #include "content/browser/renderer_host/test_render_view_host.h"

10 #include "content/browser/site_instance.h"	10 #include "content/browser/site_instance.h"

11 #include "content/browser/tab_contents/navigation_controller.h"	11 #include "content/browser/tab_contents/navigation_controller.h"

12 #include "content/browser/tab_contents/navigation_entry.h"	12 #include "content/browser/tab_contents/navigation_entry.h"

13 #include "content/browser/tab_contents/render_view_host_manager.h"	13 #include "content/browser/tab_contents/render_view_host_manager.h"

14 #include "content/browser/tab_contents/test_tab_contents.h"	14 #include "content/browser/tab_contents/test_tab_contents.h"

15 #include "content/common/notification_details.h"	15 #include "content/common/notification_details.h"

(...skipping 343 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
359 // That should have cancelled the pending RVH, and the evil RVH should be the	359 // That should have cancelled the pending RVH, and the evil RVH should be the

360 // current one.	360 // current one.

361 EXPECT_TRUE(contents()->render_manager()->pending_render_view_host() == NULL);	361 EXPECT_TRUE(contents()->render_manager()->pending_render_view_host() == NULL);

362 EXPECT_EQ(evil_rvh, contents()->render_manager()->current_host());	362 EXPECT_EQ(evil_rvh, contents()->render_manager()->current_host());

363	363

364 // Also we should not have a pending navigation entry.	364 // Also we should not have a pending navigation entry.

365 NavigationEntry* entry = contents()->controller().GetActiveEntry();	365 NavigationEntry* entry = contents()->controller().GetActiveEntry();

366 ASSERT_TRUE(entry != NULL);	366 ASSERT_TRUE(entry != NULL);

367 EXPECT_EQ(kUrl2, entry->url());	367 EXPECT_EQ(kUrl2, entry->url());

368 }	368 }

OLD	NEW