Roll base to 0032c8e1a72eb85d947d8df8de503caa62b4d0a8.

services/java_handler/java_handler.cc

 // Copyright 2014 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 "services/java_handler/java_handler.h"
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 108 matching lines @@
       });
 }
 
 bool JavaHandler::OnAcceptConnection(
     mojo::ServiceProviderImpl* service_provider_impl) {
   service_provider_impl->AddService<mojo::ContentHandler>(
       mojo::ContentHandlerFactory::GetInterfaceRequestHandler(this));
   return true;
 }
 
-void PreInvokeEvent(JNIEnv* env, jclass jcaller) {
+void PreInvokeEvent(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
   TRACE_EVENT_END0("java_handler", "JavaHandler::RunApplication");
 }
 
 }  // namespace android
 }  // namespace services
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ScopedChromiumInit init;
   services::android::JavaHandler java_handler;
   return mojo::RunApplication(application_request, &java_handler);
@@ skipping 16 matching lines @@
   return JNI_VERSION_1_4;
 }
 
 // This is needed because the application needs to access the application
 // context.
 extern "C" JNI_EXPORT void InitApplicationContext(
     const base::android::JavaRef<jobject>& context) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitApplicationContext(env, context);
 }