diff options
| author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 14:05:30 +0000 |
|---|---|---|
| committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 14:05:30 +0000 |
| commit | 600cfca2703514043313bc65cfb0e624d2fbbc84 (patch) | |
| tree | 1ea9ad2a99b364d2268afc47fbc55af06deb505b /android_webview | |
| parent | f4ab1f60e771a98f44d8283500b9f179796ecfc7 (diff) | |
| download | chromium_src-600cfca2703514043313bc65cfb0e624d2fbbc84.zip chromium_src-600cfca2703514043313bc65cfb0e624d2fbbc84.tar.gz chromium_src-600cfca2703514043313bc65cfb0e624d2fbbc84.tar.bz2 | |
Remove test checking for default touch icons.
Chrome will not handle default touch icons anymore as they are costly
in term of battery and request and most site do not have any. Sites that
want touch icons will need to have a <link> tag.
BUG=258963
R=mkosiba@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18903004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java index ae2c128..277d4ca 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java @@ -29,9 +29,6 @@ public class AwContentsClientFaviconTest extends AwTestBase { "<link rel=\"icon\" href=\""+ FAVICON1_URL + "\" />", "Body"); - private static final String TOUCHICON_URL = "apple-touch-icon.png"; - private static final String TOUCHICON_PRECOMPOSED_URL = "apple-touch-icon-precomposed.png"; - private static final String TOUCHICON_REL_LINK = "touch.png"; private static final String TOUCHICON_REL_LINK_72 = "touch_72.png"; private static final String TOUCHICON_REL_URL = "/" + TOUCHICON_REL_LINK; @@ -121,26 +118,6 @@ public class AwContentsClientFaviconTest extends AwTestBase { } @SmallTest - public void testReceiveBasicTouchIconRoot() throws Throwable { - init(new TestAwContentsClientTouchIcon()); - int callCount = mContentsClient.mFaviconHelper.getCallCount(); - - // Use the favicon page url. Since this does not specify a link rel for touch icon, - // we should get the default touch icon urls in the callback. - final String pageUrl = mWebServer.setResponse(FAVICON1_PAGE_URL, FAVICON1_PAGE_HTML, - CommonResources.getTextHtmlHeaders(true)); - - loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), pageUrl); - - mContentsClient.mFaviconHelper.waitForCallback(callCount, 2); - - HashMap<String, Boolean> touchIcons = mContentsClient.mFaviconHelper.mTouchIcons; - assertEquals(2, touchIcons.size()); - assertFalse(touchIcons.get(mWebServer.getBaseUrl() + TOUCHICON_URL)); - assertTrue(touchIcons.get(mWebServer.getBaseUrl() + TOUCHICON_PRECOMPOSED_URL)); - } - - @SmallTest public void testReceiveBasicTouchIconLinkRel() throws Throwable { init(new TestAwContentsClientTouchIcon()); int callCount = mContentsClient.mFaviconHelper.getCallCount(); |