Use correct favicon scale factor on Android.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8d755511ce7c68436fbc13f10cc6137ac0b2cdc0..004a062cc0c7896531a038b7ae2fce11b75b79ae 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -214,7 +214,6 @@
 #include "webkit/plugins/npapi/webplugin_impl.h"
 
 #if defined(OS_ANDROID)
-#include "content/common/android/device_info.h"
 #include "content/renderer/android/address_detector.h"
 #include "content/renderer/android/content_detector.h"
 #include "content/renderer/android/email_detector.h"
@@ -224,6 +223,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
+#include "ui/gfx/android/device_info.h"
 #include "ui/gfx/rect_f.h"
 #include "webkit/media/android/media_player_bridge_manager_impl.h"
 #include "webkit/media/android/webmediaplayer_android.h"
@@ -665,7 +665,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_ANDROID)
-  scoped_ptr<DeviceInfo> device_info(new DeviceInfo());
+  scoped_ptr<gfx::DeviceInfo> device_info(new gfx::DeviceInfo());
 
   const std::string region_code =
       command_line.HasSwitch(switches::kNetworkCountryIso)