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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. Created 5 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 | « chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 9fa9b52053e69294a05dcc937863669ff10acc81..e7856d47b8bb2b7db08c2c8e431448b783948602 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -253,10 +253,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, OpenURLsPopup) {
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
StartupURLsOnNewWindowWithNoTabbedBrowsers) {
// Use a couple same-site HTTP URLs.
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
std::vector<GURL> urls;
- urls.push_back(test_server()->GetURL("files/title1.html"));
- urls.push_back(test_server()->GetURL("files/title2.html"));
+ urls.push_back(embedded_test_server()->GetURL("/title1.html"));
+ urls.push_back(embedded_test_server()->GetURL("/title2.html"));
Profile* profile = browser()->profile();
chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
@@ -527,9 +527,12 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
#define MAYBE_AddFirstRunTab AddFirstRunTab
#endif
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddFirstRunTab) {
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title2.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title2.html"));
// Do a simple non-process-startup browser launch.
base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
@@ -560,10 +563,13 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddFirstRunTab) {
#define MAYBE_AddCustomFirstRunTab AddCustomFirstRunTab
#endif
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddCustomFirstRunTab) {
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser_creator.AddFirstRunTab(GURL("http://new_tab_page"));
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title2.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title2.html"));
browser_creator.AddFirstRunTab(GURL("http://welcome_page"));
// Do a simple non-process-startup browser launch.
@@ -660,8 +666,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithWelcomePage) {
}
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithFirstRunTabs) {
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
// The welcome page should not be shown, even if
// first_run::ShouldShowWelcomePage() says so, when there are already
@@ -697,8 +705,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithFirstRunTabs) {
// tabs, but the welcome page was explcitly added to the first run tabs.
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
SyncPromoWithFirstRunTabsIncludingWelcomePage) {
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser_creator.AddFirstRunTab(GURL("http://welcome_page"));
// Do a simple non-process-startup browser launch.
@@ -815,7 +825,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
// Simulate a browser restart by creating the profiles in the PRE_ part.
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
// Create two profiles.
base::FilePath dest_path = profile_manager->user_data_dir();
@@ -834,7 +844,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
browser()->host_desktop_type()));
chrome::NewTab(browser1);
ui_test_utils::NavigateToURL(browser1,
- test_server()->GetURL("files/empty.html"));
+ embedded_test_server()->GetURL("/empty.html"));
CloseBrowserSynchronously(browser1);
Browser* browser2 = new Browser(
@@ -842,7 +852,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) {
browser()->host_desktop_type()));
chrome::NewTab(browser2);
ui_test_utils::NavigateToURL(browser2,
- test_server()->GetURL("files/form.html"));
+ embedded_test_server()->GetURL("/form.html"));
CloseBrowserSynchronously(browser2);
// Set different startup preferences for the 2 profiles.
@@ -921,8 +931,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
ASSERT_TRUE(new_browser);
TabStripModel* tab_strip = new_browser->tab_strip_model();
ASSERT_EQ(1, tab_strip->count());
- EXPECT_EQ("/files/empty.html",
- tab_strip->GetWebContentsAt(0)->GetURL().path());
+ EXPECT_EQ("/empty.html", tab_strip->GetWebContentsAt(0)->GetURL().path());
ASSERT_EQ(1u, chrome::GetBrowserCount(profile2,
browser()->host_desktop_type()));
@@ -930,8 +939,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
ASSERT_TRUE(new_browser);
tab_strip = new_browser->tab_strip_model();
ASSERT_EQ(1, tab_strip->count());
- EXPECT_EQ("/files/form.html",
- tab_strip->GetWebContentsAt(0)->GetURL().path());
+ EXPECT_EQ("/form.html", tab_strip->GetWebContentsAt(0)->GetURL().path());
}
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
@@ -942,6 +950,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
switches::kAshBrowserTests))
return;
#endif
+ embedded_test_server()->Start();
Profile* default_profile = browser()->profile();
@@ -990,7 +999,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
browser()->host_desktop_type()));
chrome::NewTab(browser_last);
ui_test_utils::NavigateToURL(browser_last,
- test_server()->GetURL("files/empty.html"));
+ embedded_test_server()->GetURL("/empty.html"));
CloseBrowserAsynchronously(browser_last);
// Close the main browser.
@@ -1053,8 +1062,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
ASSERT_TRUE(new_browser);
tab_strip = new_browser->tab_strip_model();
ASSERT_EQ(1, tab_strip->count());
- EXPECT_EQ("/files/empty.html",
- tab_strip->GetWebContentsAt(0)->GetURL().path());
+ EXPECT_EQ("/empty.html", tab_strip->GetWebContentsAt(0)->GetURL().path());
// profile_home2 was not launched since it would've only opened the home page.
ASSERT_EQ(0u, chrome::GetBrowserCount(profile_home2, original_desktop_type));
@@ -1417,14 +1425,16 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// Simulate the following master_preferences:
// {
// "first_run_tabs" : [
- // "files/title1.html"
+ // "/title1.html"
// ],
// "sync_promo": {
// "show_on_first_run_allowed": true
// }
// }
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSignInPromoShowOnFirstRunAllowed, true);
@@ -1462,16 +1472,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// Simulate the following master_preferences:
// {
// "first_run_tabs" : [
- // "files/title1.html",
+ // "/title1.html",
// "chrome://signin/?source=0&next_page=chrome%3A%2F%2Fnewtab%2F"
// ],
// "sync_promo": {
// "show_on_first_run_allowed": true
// }
// }
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser_creator.AddFirstRunTab(
signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false));
browser()->profile()->GetPrefs()->SetBoolean(
@@ -1514,15 +1525,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// {
// "first_run_tabs" : [
// "new_tab_page",
- // "files/title1.html"
+ // "/title1.html"
// ],
// "sync_promo": {
// "show_on_first_run_allowed": true
// }
// }
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
browser_creator.AddFirstRunTab(GURL("http://new_tab_page"));
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSignInPromoShowOnFirstRunAllowed, true);
@@ -1563,15 +1576,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// {
// "first_run_tabs" : [
// "new_tab_page",
- // "files/title1.html"
+ // "/title1.html"
// ],
// "sync_promo": {
// "show_on_first_run_allowed": false
// }
// }
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
browser_creator.AddFirstRunTab(GURL("http://new_tab_page"));
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSignInPromoShowOnFirstRunAllowed, false);
@@ -1610,14 +1625,16 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// Simulate the following master_preferences:
// {
// "first_run_tabs" : [
- // "files/title1.html"
+ // "/title1.html"
// ],
// "sync_promo": {
// "show_on_first_run_allowed": false
// }
// }
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
- browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html"));
+ browser_creator.AddFirstRunTab(
+ embedded_test_server()->GetURL("/title1.html"));
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSignInPromoShowOnFirstRunAllowed, false);
@@ -1658,13 +1675,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
// "show_on_first_run_allowed": true
// }
// }
+ ASSERT_TRUE(embedded_test_server()->Start());
StartupBrowserCreator browser_creator;
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSignInPromoShowOnFirstRunAllowed, true);
// Set the following user policies:
// * RestoreOnStartup = RestoreOnStartupIsURLs
- // * RestoreOnStartupURLs = [ "files/title1.html" ]
+ // * RestoreOnStartupURLs = [ "/title1.html" ]
policy_map_.Set(
policy::key::kRestoreOnStartup,
policy::POLICY_LEVEL_MANDATORY,
@@ -1673,8 +1691,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,
new base::FundamentalValue(SessionStartupPref::kPrefValueURLs),
NULL);
base::ListValue startup_urls;
- startup_urls.Append(
- new base::StringValue(test_server()->GetURL("files/title1.html").spec()));
+ startup_urls.Append(new base::StringValue(
+ embedded_test_server()->GetURL("/title1.html").spec()));
policy_map_.Set(policy::key::kRestoreOnStartupURLs,
policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
policy::POLICY_SOURCE_CLOUD, startup_urls.DeepCopy(),
« no previous file with comments | « chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698