Use correct favicon scale factor on Android.

content/common/android/device_info.cc

Index: content/common/android/device_info.cc
diff --git a/content/common/android/device_info.cc b/content/common/android/device_info.cc
deleted file mode 100644
index 2522cae160aa0b60925ba4c9e5cace2519502182..0000000000000000000000000000000000000000
--- a/content/common/android/device_info.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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/common/android/device_info.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/logging.h"
-#include "jni/DeviceInfo_jni.h"
-
-using base::android::AttachCurrentThread;
-using base::android::ConvertJavaStringToUTF8;
-using base::android::ScopedJavaLocalRef;
-
-namespace content {
-
-DeviceInfo::DeviceInfo() {
-  JNIEnv* env = AttachCurrentThread();
-  j_device_info_.Reset(Java_DeviceInfo_create(env,
-      base::android::GetApplicationContext()));
-}
-
-DeviceInfo::~DeviceInfo() {
-}
-
-int DeviceInfo::GetHeight() {
-  JNIEnv* env = AttachCurrentThread();
-  jint result =
-      Java_DeviceInfo_getHeight(env, j_device_info_.obj());
-  return static_cast<int>(result);
-}
-
-int DeviceInfo::GetWidth() {
-  JNIEnv* env = AttachCurrentThread();
-  jint result =
-      Java_DeviceInfo_getWidth(env, j_device_info_.obj());
-  return static_cast<int>(result);
-}
-
-int DeviceInfo::GetBitsPerPixel() {
-  JNIEnv* env = AttachCurrentThread();
-  jint result =
-      Java_DeviceInfo_getBitsPerPixel(env, j_device_info_.obj());
-  return static_cast<int>(result);
-}
-
-int DeviceInfo::GetBitsPerComponent() {
-  JNIEnv* env = AttachCurrentThread();
-  jint result =
-      Java_DeviceInfo_getBitsPerComponent(env, j_device_info_.obj());
-  return static_cast<int>(result);
-}
-
-double DeviceInfo::GetDPIScale() {
-  JNIEnv* env = AttachCurrentThread();
-  jdouble result =
-      Java_DeviceInfo_getDPIScale(env, j_device_info_.obj());
-  return static_cast<double>(result);
-}
-
-double DeviceInfo::GetRefreshRate() {
-  JNIEnv* env = AttachCurrentThread();
-  jdouble result =
-      Java_DeviceInfo_getRefreshRate(env, j_device_info_.obj());
-  return static_cast<double>(result);
-}
-
-std::string DeviceInfo::GetNetworkCountryIso() {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> result =
-      Java_DeviceInfo_getNetworkCountryIso(env, j_device_info_.obj());
-  return ConvertJavaStringToUTF8(result);
-}
-
-bool RegisterDeviceInfo(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-}  // namespace content