Use correct favicon scale factor on Android.

content/app/android/library_loader_hooks.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 "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 10 matching lines @@
 #include "content/app/android/app_jni_registrar.h"
 #include "content/browser/android/browser_jni_registrar.h"
 #include "content/common/android/common_jni_registrar.h"
 #include "content/common/android/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "media/base/android/media_jni_registrar.h"
 #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;
 }
 
 namespace content {
 
 static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
                                           jobjectArray init_command_line) {
   InitNativeCommandLineFromJavaArray(env, init_command_line);
@@ skipping 27 matching lines @@
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   if (!base::android::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   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))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterBrowserJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!content::android::RegisterAppJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
   if (!media::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
-  if (!gfx::RegisterJni(env))
-    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
-
   return 0;
 }
 
 void LibraryLoaderExitHook() {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;
     g_at_exit_manager = NULL;
   }
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // We need the AtExitManager to be created at the very beginning.
   g_at_exit_manager = new base::AtExitManager();
 
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content