Use correct favicon scale factor on Android.

ui/gfx/android/device_info.h

Index: ui/gfx/android/device_info.h
diff --git a/content/common/android/device_info.h b/ui/gfx/android/device_info.h
similarity index 77%
rename from content/common/android/device_info.h
rename to ui/gfx/android/device_info.h
index 017961f21bc009e2424ec248035ae77a136d7a0a..ccb889ac1d0e815840fb316ad032f44c1f5eaa91 100644
--- a/content/common/android/device_info.h
+++ b/ui/gfx/android/device_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_ANDROID_DEVICE_INFO_H_
-#define CONTENT_COMMON_ANDROID_DEVICE_INFO_H_
+#ifndef UI_GFX_ANDROID_DEVICE_INFO_H_
+#define UI_GFX_ANDROID_DEVICE_INFO_H_
 
 #include <jni.h>
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 
-namespace content {
+namespace gfx {
 
 // Facilitates access to device information typically only
 // available using the Android SDK, including Display properties.
@@ -28,14 +28,14 @@ class DeviceInfo {
   double GetRefreshRate();
   std::string GetNetworkCountryIso();
 
+  static bool RegisterDeviceInfo(JNIEnv* env);
+
  private:
   base::android::ScopedJavaGlobalRef<jobject> j_device_info_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfo);
 };
 
-bool RegisterDeviceInfo(JNIEnv* env);
-
-}  // namespace content
+}  // namespace gfx
 
-#endif  // CONTENT_COMMON_ANDROID_DEVICE_INFO_H_
+#endif  // UI_GFX_ANDROID_DEVICE_INFO_H_