chrome/browser/tab_contents/render_view_host_manager_unittest.cc - Issue 7049010: Finish removing url_constants from content/.

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: chrome/browser/tab_contents/render_view_host_manager_unittest.cc

Issue 7049010: Finish removing url_constants from content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 7 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

« chrome/browser/renderer_host/render_process_host_browsertest.cc ('K') | « chrome/browser/renderer_host/render_process_host_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
	jam 2011/05/19 17:21:16 it seems that almost all of this file belongs in c it seems that almost all of this file belongs in content. where we use chrome urls, can we use made up urls instead and keep this in content? Avi (use Gerrit) 2011/05/19 22:28:41 Done. Show quoted text On 2011/05/19 17:21:16, John Abd-El-Malek wrote: > it seems that almost all of this file belongs in content. where we use chrome > urls, can we use made up urls instead and keep this in content? Done.
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/browser/browser_url_handler.h"	5 #include "chrome/browser/browser_url_handler.h"

6 #include "chrome/common/render_messages.h"	6 #include "chrome/common/render_messages.h"

7 #include "chrome/common/url_constants.h"	7 #include "chrome/common/url_constants.h"

8 #include "chrome/test/test_notification_tracker.h"	8 #include "chrome/test/test_notification_tracker.h"

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

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

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

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

355 // current one.	355 // current one.

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

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

358	358

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

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

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

362 EXPECT_EQ(url2, entry->url());	362 EXPECT_EQ(url2, entry->url());

363 }	363 }

OLD	NEW