Remove test checking for default touch icons.

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 11 matching lines @@
  */
 public class AwContentsClientFaviconTest extends AwTestBase {
 
     private static final String FAVICON1_URL = "/favicon1.png";
     private static final String FAVICON1_PAGE_URL = "/favicon1.html";
     private static final String FAVICON1_PAGE_HTML =
       CommonResources.makeHtmlPageFrom(
         "<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;
     private static final String TOUCHICON_REL_URL_72 = "/" + TOUCHICON_REL_LINK_72;
     private static final String TOUCHICON_REL_PAGE_HTML =
       CommonResources.makeHtmlPageFrom(
         "<link rel=\"apple-touch-icon\" href=\""+ TOUCHICON_REL_URL + "\" />" +
         "<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\""+ TOUCHICON_REL_URL_72 + "\" />",
         "Body");
 
@@ skipping 69 matching lines @@
 
         mContentsClient.mFaviconHelper.waitForCallback(callCount);
         Object originalFaviconSource = (new URL(faviconUrl)).getContent();
         Bitmap originalFavicon = BitmapFactory.decodeStream((InputStream)originalFaviconSource);
         assertNotNull(originalFavicon);
         assertNotNull(mContentsClient.mFaviconHelper.mIcon);
         assertTrue(mContentsClient.mFaviconHelper.mIcon.sameAs(originalFavicon));
     }
 
     @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();
 
         final String pageUrl = mWebServer.setResponse(TOUCHICON_REL_URL, TOUCHICON_REL_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_REL_LINK));
         assertFalse(touchIcons.get(mWebServer.getBaseUrl() + TOUCHICON_REL_LINK_72));
     }
 }