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

Unified Diff: content/browser/tab_contents/render_view_host_manager_unittest.cc

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 2 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 | « content/browser/tab_contents/page_navigator.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/render_view_host_manager_unittest.cc
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index 7146b6bc1c1bb0f1bdc19f34b4ef134f1caa3476..20fd953d422b0b9d6af29fd5935bff087d42170f 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -206,7 +206,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
const GURL kUrl1("http://www.google.com/");
NavigationEntry entry1(NULL /* instance */, -1 /* page_id */, kUrl1,
GURL() /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_TYPED);
+ content::PAGE_TRANSITION_TYPED,
+ false /* is_renderer_init */);
host = manager.Navigate(entry1);
// The RenderViewHost created in Init will be reused.
@@ -225,7 +226,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
const GURL kUrl2("http://www.google.com/foo");
NavigationEntry entry2(NULL /* instance */, -1 /* page_id */, kUrl2,
kUrl1 /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_LINK);
+ content::PAGE_TRANSITION_LINK,
+ true /* is_renderer_init */);
host = manager.Navigate(entry2);
// The RenderViewHost created in Init will be reused.
@@ -242,7 +244,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
const GURL kUrl3("http://webkit.org/");
NavigationEntry entry3(NULL /* instance */, -1 /* page_id */, kUrl3,
kUrl2 /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_LINK);
+ content::PAGE_TRANSITION_LINK,
+ false /* is_renderer_init */);
host = manager.Navigate(entry3);
// A new RenderViewHost should be created.
@@ -277,7 +280,8 @@ TEST_F(RenderViewHostManagerTest, WebUI) {
const GURL kUrl(chrome::kTestNewTabURL);
NavigationEntry entry(NULL /* instance */, -1 /* page_id */, kUrl,
GURL() /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_TYPED);
+ content::PAGE_TRANSITION_TYPED,
+ false /* is_renderer_init */);
RenderViewHost* host = manager.Navigate(entry);
EXPECT_TRUE(host);
@@ -315,7 +319,8 @@ TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
const GURL kNtpUrl(chrome::kTestNewTabURL);
NavigationEntry ntp_entry(NULL /* instance */, -1 /* page_id */, kNtpUrl,
GURL() /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_TYPED);
+ content::PAGE_TRANSITION_TYPED,
+ false /* is_renderer_init */);
// about: URLs are not Web UI pages.
GURL about_url(chrome::kTestMemoryURL);
@@ -325,7 +330,8 @@ TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
&about_url, profile(), &reverse_on_redirect);
NavigationEntry about_entry(NULL /* instance */, -1 /* page_id */, about_url,
GURL() /* referrer */, string16() /* title */,
- content::PAGE_TRANSITION_TYPED);
+ content::PAGE_TRANSITION_TYPED,
+ false /* is_renderer_init */);
EXPECT_TRUE(ShouldSwapProcesses(&manager, &ntp_entry, &about_entry));
}
« no previous file with comments | « content/browser/tab_contents/page_navigator.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698