Remove now-unnecessary .obj() in Java method calls.

chrome/browser/media/android/router/media_router_android.cc

 // Copyright 2015 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 "chrome/browser/media/android/router/media_router_android.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 99 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jsource_id =
           base::android::ConvertUTF8ToJavaString(env, source_id);
   ScopedJavaLocalRef<jstring> jsink_id =
           base::android::ConvertUTF8ToJavaString(env, sink_id);
   ScopedJavaLocalRef<jstring> jpresentation_id =
           base::android::ConvertUTF8ToJavaString(env, presentation_id);
   ScopedJavaLocalRef<jstring> jorigin =
           base::android::ConvertUTF8ToJavaString(env, origin.spec());
 
-  Java_ChromeMediaRouter_createRoute(
-      env,
-      java_media_router_.obj(),
-      jsource_id.obj(),
-      jsink_id.obj(),
-      jpresentation_id.obj(),
-      jorigin.obj(),
-      tab_id,
-      is_incognito,
-      route_request_id);
+  Java_ChromeMediaRouter_createRoute(env, java_media_router_, jsource_id,
+                                     jsink_id, jpresentation_id, jorigin,
+                                     tab_id, is_incognito, route_request_id);
 }
 
 void MediaRouterAndroid::ConnectRouteByRouteId(
     const MediaSource::Id& source,
     const MediaRoute::Id& route_id,
     const GURL& origin,
     content::WebContents* web_contents,
     const std::vector<MediaRouteResponseCallback>& callbacks,
     base::TimeDelta timeout,
     bool incognito) {
@@ skipping 33 matching lines @@
   int request_id = route_requests_.Add(request);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jsource_id =
           base::android::ConvertUTF8ToJavaString(env, source_id);
   ScopedJavaLocalRef<jstring> jpresentation_id =
           base::android::ConvertUTF8ToJavaString(env, presentation_id);
   ScopedJavaLocalRef<jstring> jorigin =
           base::android::ConvertUTF8ToJavaString(env, origin.spec());
 
-  Java_ChromeMediaRouter_joinRoute(
-      env,
-      java_media_router_.obj(),
-      jsource_id.obj(),
-      jpresentation_id.obj(),
-      jorigin.obj(),
-      tab_id,
-      request_id);
+  Java_ChromeMediaRouter_joinRoute(env, java_media_router_, jsource_id,
+                                   jpresentation_id, jorigin, tab_id,
+                                   request_id);
 }
 
 void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
-  Java_ChromeMediaRouter_closeRoute(
-      env, java_media_router_.obj(), jroute_id.obj());
+  Java_ChromeMediaRouter_closeRoute(env, java_media_router_, jroute_id);
 }
 
 void MediaRouterAndroid::SendRouteMessage(
     const MediaRoute::Id& route_id,
     const std::string& message,
     const SendRouteMessageCallback& callback) {
   int callback_id = message_callbacks_.Add(
       new SendRouteMessageCallback(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
   ScopedJavaLocalRef<jstring> jmessage =
           base::android::ConvertUTF8ToJavaString(env, message);
-  Java_ChromeMediaRouter_sendStringMessage(
-      env,
-      java_media_router_.obj(),
-      jroute_id.obj(),
-      jmessage.obj(),
-      callback_id);
+  Java_ChromeMediaRouter_sendStringMessage(env, java_media_router_, jroute_id,
+                                           jmessage, callback_id);
 }
 
 void MediaRouterAndroid::SendRouteBinaryMessage(
     const MediaRoute::Id& route_id,
     std::unique_ptr<std::vector<uint8_t>> data,
     const SendRouteMessageCallback& callback) {
   int callback_id =
       message_callbacks_.Add(new SendRouteMessageCallback(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
       base::android::ConvertUTF8ToJavaString(env, route_id);
   ScopedJavaLocalRef<jbyteArray> jbyte_array =
       base::android::ToJavaByteArray(env, &((*data)[0]), data->size());
-  Java_ChromeMediaRouter_sendBinaryMessage(env, java_media_router_.obj(),
-                                           jroute_id.obj(), jbyte_array.obj(),
-                                           callback_id);
+  Java_ChromeMediaRouter_sendBinaryMessage(env, java_media_router_, jroute_id,
+                                           jbyte_array, callback_id);
 }
 
 void MediaRouterAndroid::AddIssue(const Issue& issue) {
   NOTIMPLEMENTED();
 }
 
 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) {
   NOTIMPLEMENTED();
 }
 
 void MediaRouterAndroid::OnUserGesture() {
 }
 
 void MediaRouterAndroid::SearchSinks(
     const MediaSink::Id& sink_id,
     const MediaSource::Id& source_id,
     const std::string& search_input,
     const std::string& domain,
     const MediaSinkSearchResponseCallback& sink_callback) {
   NOTIMPLEMENTED();
 }
 
 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
-  Java_ChromeMediaRouter_detachRoute(
-      env, java_media_router_.obj(), jroute_id.obj());
+  Java_ChromeMediaRouter_detachRoute(env, java_media_router_, jroute_id);
 }
 
 bool MediaRouterAndroid::RegisterMediaSinksObserver(
     MediaSinksObserver* observer) {
   const std::string& source_id = observer->source().id();
   base::ObserverList<MediaSinksObserver>* observer_list =
       sinks_observers_.get(source_id);
   if (!observer_list) {
     observer_list = new base::ObserverList<MediaSinksObserver>;
     sinks_observers_.add(source_id, base::WrapUnique(observer_list));
   } else {
     DCHECK(!observer_list->HasObserver(observer));
   }
 
   observer_list->AddObserver(observer);
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jsource_id =
       base::android::ConvertUTF8ToJavaString(env, source_id);
   return Java_ChromeMediaRouter_startObservingMediaSinks(
-      env, java_media_router_.obj(), jsource_id.obj());
+      env, java_media_router_, jsource_id);
 }
 
 void MediaRouterAndroid::UnregisterMediaSinksObserver(
     MediaSinksObserver* observer) {
   const std::string& source_id = observer->source().id();
   auto* observer_list = sinks_observers_.get(source_id);
   if (!observer_list || !observer_list->HasObserver(observer))
     return;
 
   // If we are removing the final observer for the source, then stop
   // observing sinks for it.
   // might_have_observers() is reliable here on the assumption that this call
   // is not inside the ObserverList iteration.
   observer_list->RemoveObserver(observer);
   if (!observer_list->might_have_observers()) {
     sinks_observers_.erase(source_id);
     JNIEnv* env = base::android::AttachCurrentThread();
     ScopedJavaLocalRef<jstring> jsource_id =
         base::android::ConvertUTF8ToJavaString(env, source_id);
-    Java_ChromeMediaRouter_stopObservingMediaSinks(
-        env, java_media_router_.obj(), jsource_id.obj());
+    Java_ChromeMediaRouter_stopObservingMediaSinks(env, java_media_router_,
+                                                   jsource_id);
   }
 }
 
 void MediaRouterAndroid::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DVLOG(2) << "Added MediaRoutesObserver: " << observer;
   if (!observer->source_id().empty())
     NOTIMPLEMENTED() << "Joinable routes query not implemented.";
 
   routes_observers_.AddObserver(observer);
@@ skipping 40 matching lines @@
 }
 
 void MediaRouterAndroid::OnSinksReceived(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& jsource_urn,
     jint jcount) {
   std::vector<MediaSink> sinks_converted;
   sinks_converted.reserve(jcount);
   for (int i = 0; i < jcount; ++i) {
-    ScopedJavaLocalRef<jstring> jsink_urn =
-        Java_ChromeMediaRouter_getSinkUrn(
-            env, java_media_router_.obj(), jsource_urn, i);
-    ScopedJavaLocalRef<jstring> jsink_name =
-        Java_ChromeMediaRouter_getSinkName(
-            env, java_media_router_.obj(), jsource_urn, i);
+    ScopedJavaLocalRef<jstring> jsink_urn = Java_ChromeMediaRouter_getSinkUrn(
+        env, java_media_router_, jsource_urn, i);
+    ScopedJavaLocalRef<jstring> jsink_name = Java_ChromeMediaRouter_getSinkName(
+        env, java_media_router_, jsource_urn, i);
     sinks_converted.push_back(
         MediaSink(ConvertJavaStringToUTF8(env, jsink_urn.obj()),
         ConvertJavaStringToUTF8(env, jsink_name.obj()),
         MediaSink::GENERIC));
   }
 
   std::string source_urn = ConvertJavaStringToUTF8(env, jsource_urn);
   auto it = sinks_observers_.find(source_urn);
   if (it != sinks_observers_.end()) {
     // TODO(imcheng): Pass origins to OnSinksUpdated (crbug.com/594858).
@@ skipping 102 matching lines @@
     return;
 
   std::vector<RouteMessage> messages(1);
   messages.front().type = RouteMessage::TEXT;
   messages.front().text = ConvertJavaStringToUTF8(env, jmessage);
   FOR_EACH_OBSERVER(RouteMessageObserver, *observer_list,
                     OnMessagesReceived(messages));
 }
 
 }  // namespace media_router