Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

content/browser/android/content_video_view.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/browser/android/content_video_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 13 matching lines @@
 
 namespace content {
 
 namespace {
 // There can only be one content video view at a time, this holds onto that
 // singleton instance.
 ContentVideoView* g_content_video_view = NULL;
 
 }  // namespace
 
-static ScopedJavaLocalRef<jobject> GetSingletonJavaContentVideoView(JNIEnv* env,
-                                                                    jclass) {
+static jobject GetSingletonJavaContentVideoView(JNIEnv*env, jclass) {
   if (g_content_video_view)
-    return g_content_video_view->GetJavaObject(env);
+    return g_content_video_view->GetJavaObject(env).Release();
   else
-    return ScopedJavaLocalRef<jobject>();
+    return NULL;
 }
 
 bool ContentVideoView::RegisterContentVideoView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 ContentVideoView* ContentVideoView::GetInstance() {
   return g_content_video_view;
 }
 
@@ skipping 156 matching lines @@
     return JavaObjectWeakGlobalRef(env, nullptr);
 
   return JavaObjectWeakGlobalRef(
       env,
       Java_ContentVideoView_createContentVideoView(
           env,
           j_content_view_core.obj(),
           reinterpret_cast<intptr_t>(this)).obj());
 }
 }  // namespace content