Use correct favicon scale factor on Android.

content/app/android/library_loader_hooks.cc

Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 80026b869bcb14cbefc4108c4993888ef1f74929..ac6ef272de04e6fe0840a3d5151fbde19b16839c 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -28,7 +28,6 @@
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
 #include "jni/LibraryLoader_jni.h"
-#include "ui/gfx/android/gfx_jni_registrar.h"
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
@@ -76,7 +75,7 @@ static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
   if (!net::android::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
-  if (!ui::RegisterJni(env))
+  if (!ui::android::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterCommonJni(env))
@@ -91,9 +90,6 @@ static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
   if (!media::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
-  if (!gfx::RegisterJni(env))
-    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
-
   return 0;
 }