chrome/test/data/webui/icon_test.html - Issue 1919183005: Cleanup: Extract icon related methods outside of util.js

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/test/data/webui/icon_test.html

Issue 1919183005: Cleanup: Extract icon related methods outside of util.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename favicon.html to icon.html Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_settings_behavior.js ('k') | chrome/test/data/webui/util_test.html » ('j') | chrome/test/data/webui/webui_resource_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/webui/icon_test.html

diff --git a/chrome/test/data/webui/util_test.html b/chrome/test/data/webui/icon_test.html

similarity index 67%

copy from chrome/test/data/webui/util_test.html

copy to chrome/test/data/webui/icon_test.html

index 6fdb55127b703430e23ef35c59d6d1fbdf7e2b68..a01fd760b1782f2c3e1e583bc5fe6e4b586eec78 100644

--- a/chrome/test/data/webui/util_test.html

+++ b/chrome/test/data/webui/icon_test.html

@@ -3,23 +3,6 @@

<body>

-function testQuoteString() {

- // Basic cases.

- assertEquals('\"test\"', quoteString('"test"'));

- assertEquals('\\!\\?', quoteString('!?'));

- assertEquals('\\(\\._\\.\\) \\( \\:l \\) \\(\\.-\\.\\)',

- quoteString('(._.) ( :l ) (.-.)'));

- // Using the output as a regex.

- var re = new RegExp(quoteString('"hello"'), 'gim');

- var match = re.exec('She said "Hello" loudly');

- assertEquals(9, match.index);

- re = new RegExp(quoteString('Hello, .*'), 'gim');

- match = re.exec('Hello, world');

- assertEquals(null, match);

// Test the case where a non-favicon URL is passed.

function testGetFaviconImageSet_NonFavicon() {

var url = 'http://foo.com';

@@ -32,7 +15,7 @@ function testGetFaviconImageSet_NonFavicon() {

var isDesktop = cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux;

var expected = isDesktop ? expectedDesktop : expectedOther;

- assertEquals(expected, getFaviconImageSet(url));

+ assertEquals(expected, cr.icon.getFaviconImageSet(url));

}

// Test the case where the favicon URL is passed.

@@ -47,7 +30,7 @@ function testGetFaviconImageSet_IconUrl() {

var isDesktop = cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux;

var expected = isDesktop ? expectedDesktop : expectedOther;

- assertEquals(expected, getFaviconImageSet(url));

+ assertEquals(expected, cr.icon.getFaviconImageSet(url));

}

</script>