Use correct favicon scale factor on Android.

ui/gfx/android/java_bitmap.cc

 // 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.
 
 #include "ui/gfx/android/java_bitmap.h"
 
 #include <android/bitmap.h>
 
 #include "base/logging.h"
 #include "jni/BitmapHelper_jni.h"
@@ skipping 17 matching lines @@
   size_ = gfx::Size(info.width, info.height);
   format_ = info.format;
   stride_ = info.stride;
 }
 
 JavaBitmap::~JavaBitmap() {
   int err = AndroidBitmap_unlockPixels(AttachCurrentThread(), bitmap_);
   DCHECK(!err);
 }
 
-void RegisterBitmapAndroid(JNIEnv* env) {
-  ui::RegisterNativesImpl(env);
+bool RegisterBitmapAndroid(JNIEnv* env) {
+  return ui::RegisterNativesImpl(env);
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
   return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
       size.width(), size.height());
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   DCHECK_EQ(skbitmap->bytesPerPixel(), 4);
@@ skipping 34 matching lines @@
   memcpy(dst_pixels, src_pixels, skbitmap.getSize());
 
   return skbitmap;
 }
 
 SkBitmap CreateSkBitmapFromResource(const char* name) {
   return ConvertToSkBitmap(CreateJavaBitmapFromResource(name));
 }
 
 }  //  namespace gfx