Use correct favicon scale factor on Android.

ui/gfx/android/device_info.h

 // 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.
 
-#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>
 
 #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.
 class DeviceInfo {
  public:
   DeviceInfo();
   ~DeviceInfo();
 
   int GetHeight();

[nilesh, 2013/01/16 20:24:01]

It will be nice to have one line documentation on some of these. Is it Device
physical height in some unit or display height in pixels ? :)

Better if rename this to GetDisplayHeight and have a comment on the unit.

[aruslan, 2013/01/16 23:14:45]

Done.

   int GetWidth();
   int GetBitsPerPixel();
   int GetBitsPerComponent();
   double GetDPIScale();
   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 gfx
 
-}  // namespace content
-
-#endif  // CONTENT_COMMON_ANDROID_DEVICE_INFO_H_
+#endif  // UI_GFX_ANDROID_DEVICE_INFO_H_