Roll base to 0032c8e1a72eb85d947d8df8de503caa62b4d0a8.

ui/gfx/android/shared_device_display_info.cc

 // Copyright 2013 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/shared_device_display_info.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "jni/DeviceDisplayInfo_jni.h"
 
 namespace gfx {
 
 // static JNI call
 static void UpdateSharedDeviceDisplayInfo(JNIEnv* env,
-                                          jobject obj,
+                                          const JavaParamRef<jobject>& obj,
                                           jint display_height,
                                           jint display_width,
                                           jint physical_display_height,
                                           jint physical_display_width,
                                           jint bits_per_pixel,
                                           jint bits_per_component,
                                           jdouble dip_scale,
                                           jint smallest_dip_width,
                                           jint rotation_degrees) {
   SharedDeviceDisplayInfo::GetInstance()->InvokeUpdate(env, obj,
@@ skipping 127 matching lines @@
   physical_display_height_ = static_cast<int>(physical_display_height);
   physical_display_width_ = static_cast<int>(physical_display_width);
   bits_per_pixel_ = static_cast<int>(bits_per_pixel);
   bits_per_component_ = static_cast<int>(bits_per_component);
   dip_scale_ = static_cast<double>(dip_scale);
   smallest_dip_width_ = static_cast<int>(smallest_dip_width);
   rotation_degrees_ = static_cast<int>(rotation_degrees);
 }
 
 }  // namespace gfx