ios/web/web_state/favicon_callbacks_inttest.mm - Issue 2880723002: Favicon url is used only if it is valid

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: ios/web/web_state/favicon_callbacks_inttest.mm

Issue 2880723002: Favicon url is used only if it is valid (Closed)

Patch Set: Add the default favicon in native code Created 3 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:

Index: ios/web/web_state/favicon_callbacks_inttest.mm

diff --git a/ios/web/web_state/favicon_callbacks_inttest.mm b/ios/web/web_state/favicon_callbacks_inttest.mm

index acc1479fdc38aa07081b9390e54fa88fdb4d4825..fc998fc4d6dd32cdb0b4e7db3e6888f588aef349 100644

--- a/ios/web/web_state/favicon_callbacks_inttest.mm

+++ b/ios/web/web_state/favicon_callbacks_inttest.mm

@@ -120,7 +120,7 @@ TEST_F(FaviconCallbackTest, AppleTouchIconPrecomposedFavicon) {

// Tests page without favicon link.

TEST_F(FaviconCallbackTest, NoFavicon) {

ASSERT_TRUE(observer_->favicon_url_candidates().empty());

- LoadHtml(@"<html></html>", GURL("https://chromium.test"));

+ LoadHtml(@"<html></html>", GURL("https://chromium.test/test/test.html"));

WaitForCondition(^{

return observer_->favicon_url_updated();

@@ -164,7 +164,8 @@ TEST_F(FaviconCallbackTest, MultipleFavicons) {

// Tests page with invalid favicon url.

TEST_F(FaviconCallbackTest, InvalidFaviconUrl) {

ASSERT_TRUE(observer_->favicon_url_candidates().empty());

- LoadHtml(@"<head><link rel='icon' href='http://'></head>");

+ LoadHtml(@"<html><head><link rel='icon' href='http://'></head></html>",

+ GURL("https://chromium.test"));

Eugene But (OOO till 7-30) 2017/05/17 14:18:18 Should this be "https://chromium.test/test/test.ht

gambard 2017/05/17 16:05:37 The idea to put https://chromium.test/test/test.ht

WaitForCondition(^{

return observer_->favicon_url_updated();

@@ -172,7 +173,7 @@ TEST_F(FaviconCallbackTest, InvalidFaviconUrl) {

const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates();

ASSERT_EQ(1U, favicons.size());

- EXPECT_EQ("http:", favicons[0].icon_url.possibly_invalid_spec());

+ EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[0].icon_url);

EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type);

ASSERT_TRUE(favicons[0].icon_sizes.empty());

};