Use correct favicon scale factor on Android.

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 367dde33be2c539c9ecc1ac23f5939f18c2f79ce..a73c440adb4fdaa724c81eea0eb3f35737f1836c 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -78,7 +78,17 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() {
     supported_scale_factors->push_back(SCALE_FACTOR_100P);
 #endif
 
-#if defined(OS_IOS)
+#if defined(OS_ANDROID)
+    const gfx::Display display =
+        gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
+    const float display_density = display.device_scale_factor();
+    for (int i = NUM_SCALE_FACTORS; --i > SCALE_FACTOR_100P;) {

[sky, 2013/01/17 01:02:32]

It's pretty unusual to have -- outside the last part of the if, why not the more
conventional:
for (int i = NSF - 1; i > SCALE_FACTORS_100P; --i) ?

[aruslan, 2013/01/17 02:11:47]

Done.

+      if (display_density >= kScaleFactorScales[i]) {
+        supported_scale_factors->push_back(static_cast<ScaleFactor>(i));
+        break;
+      }
+    }
+#elif defined(OS_IOS)
     gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
     if (display.device_scale_factor() > 1.0) {
       DCHECK_EQ(2.0, display.device_scale_factor());