Use correct favicon scale factor on Android.

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.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.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.WebSettings;
 
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.chromium.android_webview.AndroidProtocolHandler;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.ImagePageGenerator;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.ContentSettings.LayoutAlgorithm;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.HistoryUtils;
-import org.chromium.content.common.DeviceInfo;
 import org.chromium.net.test.util.TestWebServer;
+import org.chromium.ui.gfx.DeviceInfo;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A test suite for ContentSettings class. The key objective is to verify that each
  * settings applies either to each individual view or to all views of the
  * application
@@ skipping 2052 matching lines @@
         final String pageNoViewport = String.format(pageTemplate, "");
         final String pageViewportDeviceWidth = String.format(
                 pageTemplate,
                 "<meta name='viewport' content='width=device-width' />");
         final String viewportTagSpecifiedWidth = "3000";
         final String pageViewportSpecifiedWidth = String.format(
                 pageTemplate,
                 "<meta name='viewport' content='width=" + viewportTagSpecifiedWidth + "' />");
 
         DeviceInfo deviceInfo = DeviceInfo.create(getInstrumentation().getTargetContext());
-        int displayWidth = (int) (deviceInfo.getWidth() / deviceInfo.getDPIScale());
+        int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale());
 
         settings.setJavaScriptEnabled(true);
         assertFalse(settings.getUseWideViewPort());
         // When UseWideViewPort is off, "meta viewport" tags are ignored,
         // and the layout width is set to device width in CSS pixels.
         // Thus, all 3 pages will have the same body width.
         loadDataSync(awContents, onPageFinishedHelper, pageNoViewport, "text/html", false);
         int actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));
         // Avoid rounding errors.
         assertTrue("Expected: " + displayWidth + ", Actual: " + actualWidth,
@@ skipping 142 matching lines @@
         AndroidProtocolHandler.setResourceContextForTesting(getInstrumentation().getContext());
     }
 
     /**
      * Configure the browser to load resources from the browser application.
      */
     private void resetResourceContext() {
         AndroidProtocolHandler.setResourceContextForTesting(null);
     }
 }