chrome/browser/ui/startup/startup_browser_creator_browsertest.cc - Issue 24733003: Update defaults for InstantExtended.

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/ui/startup/startup_browser_creator_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test exclusion. Created 7 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

« chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc ('K') | « chrome/browser/ui/search/search_tab_helper_unittest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

index d76ca8de49a148695ae2699029f27e57c477a973..31104e7dc8abd0501f14f8b3a549e261b661396e 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -22,6 +22,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_impl.h"

#include "chrome/browser/profiles/profile_manager.h"

+#include "chrome/browser/search/search.h"

#include "chrome/browser/sessions/session_restore.h"

#include "chrome/browser/signin/signin_promo.h"

#include "chrome/browser/ui/browser.h"

@@ -438,8 +439,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, AddCustomFirstRunTab) {

EXPECT_EQ("title1.html",

tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());

- EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),

- tab_strip->GetWebContentsAt(1)->GetURL());

+ EXPECT_TRUE(chrome::IsInstantNTP(tab_strip->GetWebContentsAt(1)));

EXPECT_EQ("title2.html",

tab_strip->GetWebContentsAt(2)->GetURL().ExtractFileName());

EXPECT_EQ(internals::GetWelcomePageURL(),

@@ -465,8 +465,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoNoWelcomePage) {

EXPECT_EQ(signin::GetPromoURL(signin::SOURCE_START_PAGE, false),

tab_strip->GetWebContentsAt(0)->GetURL());

} else {

- EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),

- tab_strip->GetWebContentsAt(0)->GetURL());

+ EXPECT_TRUE(chrome::IsInstantNTP(tab_strip->GetWebContentsAt(0)));

}

@@ -491,8 +490,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithWelcomePage) {

EXPECT_EQ(signin::GetPromoURL(signin::SOURCE_START_PAGE, false),

tab_strip->GetWebContentsAt(0)->GetURL());

} else {

- EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),

- tab_strip->GetWebContentsAt(0)->GetURL());

+ EXPECT_TRUE(chrome::IsInstantNTP(tab_strip->GetWebContentsAt(0)));

}

EXPECT_EQ(internals::GetWelcomePageURL(),

tab_strip->GetWebContentsAt(1)->GetURL());