chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc - Issue 1378123003: Adding SSL ETS Tests

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/ash/launcher/launcher_favicon_loader_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/app_list/search/webstore/webstore_provider_browsertest.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

index 85a93a29edfb0c7e09712098f5a4ff0283a29887..c1dfff80a91bb48cdbdfd41680e48f577e80a54f 100644

--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

@@ -78,8 +78,9 @@ class LauncherFaviconLoaderBrowsertest

protected:

bool NavigateTo(const char* url) {

- std::string url_path = base::StringPrintf("files/ash/launcher/%s", url);

- ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(url_path));

+ std::string url_path = base::StringPrintf("/ash/launcher/%s", url);

+ ui_test_utils::NavigateToURL(browser(),

+ embedded_test_server()->GetURL(url_path));

return true;

}

@@ -125,7 +126,7 @@ class LauncherFaviconLoaderBrowsertest

};

IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, SmallLauncherIcon) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(NavigateTo("launcher-smallfavicon.html"));

EXPECT_TRUE(WaitForContentsLoaded());

EXPECT_TRUE(WaitForFaviconUpdated());

@@ -135,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, SmallLauncherIcon) {

}

IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));

EXPECT_TRUE(WaitForContentsLoaded());

EXPECT_TRUE(WaitForFaviconUpdated());

@@ -145,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) {

}

IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));

EXPECT_TRUE(WaitForContentsLoaded());

EXPECT_TRUE(WaitForFaviconUpdated());

@@ -158,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {

}

IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));

EXPECT_TRUE(WaitForContentsLoaded());

EXPECT_TRUE(WaitForFaviconUpdated());