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

content/browser/accessibility/browser_accessibility_manager_android.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 "content/browser/accessibility/browser_accessibility_manager_android.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 136 matching lines @@
   SetContentViewCore(content_view_core);
 }
 
 BrowserAccessibilityManagerAndroid::~BrowserAccessibilityManagerAndroid() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
   if (obj.is_null())
     return;
 
   Java_BrowserAccessibilityManager_onNativeObjectDestroyed(
-      env, obj.obj(),reinterpret_cast<intptr_t>(this));
+      env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 // static
 ui::AXTreeUpdate
     BrowserAccessibilityManagerAndroid::GetEmptyDocument() {
   ui::AXNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   empty_document.state = 1 << ui::AX_STATE_READ_ONLY;
 
   ui::AXTreeUpdate update;
   update.root_id = empty_document.id;
   update.nodes.push_back(empty_document);
   return update;
 }
 
 void BrowserAccessibilityManagerAndroid::SetContentViewCore(
     ScopedJavaLocalRef<jobject> content_view_core) {
   if (content_view_core.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   java_ref_ = JavaObjectWeakGlobalRef(
       env, Java_BrowserAccessibilityManager_create(
-          env, reinterpret_cast<intptr_t>(this),
-          content_view_core.obj()).obj());
+               env, reinterpret_cast<intptr_t>(this), content_view_core)
+               .obj());
 }
 
 bool BrowserAccessibilityManagerAndroid::ShouldExposePasswordText() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
   if (obj.is_null())
     return false;
 
-  return Java_BrowserAccessibilityManager_shouldExposePasswordText(
-      env, obj.obj());
+  return Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj);
 }
 
 BrowserAccessibility* BrowserAccessibilityManagerAndroid::GetFocus() {
   BrowserAccessibility* focus = BrowserAccessibilityManager::GetFocus();
   return GetActiveDescendant(focus);
 }
 
 void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent(
     BrowserAccessibilityEvent::Source source,
     ui::AXEvent event_type,
@@ skipping 18 matching lines @@
     return;
 
   if (event_type == ui::AX_EVENT_HOVER) {
     HandleHoverEvent(node);
     return;
   }
 
   // Always send AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED to notify
   // the Android system that the accessibility hierarchy rooted at this
   // node has changed.
-  Java_BrowserAccessibilityManager_handleContentChanged(
-      env, obj.obj(), node->unique_id());
+  Java_BrowserAccessibilityManager_handleContentChanged(env, obj,
+                                                        node->unique_id());
 
   // Ignore load complete events on iframes.
   if (event_type == ui::AX_EVENT_LOAD_COMPLETE &&
       node->manager() != GetRootManager()) {
     return;
   }
 
   switch (event_type) {
     case ui::AX_EVENT_LOAD_COMPLETE:
       Java_BrowserAccessibilityManager_handlePageLoaded(
-          env, obj.obj(), GetFocus()->unique_id());
+          env, obj, GetFocus()->unique_id());
       break;
     case ui::AX_EVENT_FOCUS:
-      Java_BrowserAccessibilityManager_handleFocusChanged(
-          env, obj.obj(), node->unique_id());
+      Java_BrowserAccessibilityManager_handleFocusChanged(env, obj,
+                                                          node->unique_id());
       break;
     case ui::AX_EVENT_CHECKED_STATE_CHANGED:
       Java_BrowserAccessibilityManager_handleCheckStateChanged(
-          env, obj.obj(), node->unique_id());
+          env, obj, node->unique_id());
       break;
     case ui::AX_EVENT_CLICKED:
-      Java_BrowserAccessibilityManager_handleClicked(env, obj.obj(),
+      Java_BrowserAccessibilityManager_handleClicked(env, obj,
                                                      node->unique_id());
       break;
     case ui::AX_EVENT_SCROLL_POSITION_CHANGED:
       Java_BrowserAccessibilityManager_handleScrollPositionChanged(
-          env, obj.obj(), node->unique_id());
+          env, obj, node->unique_id());
       break;
     case ui::AX_EVENT_SCROLLED_TO_ANCHOR:
       Java_BrowserAccessibilityManager_handleScrolledToAnchor(
-          env, obj.obj(), node->unique_id());
+          env, obj, node->unique_id());
       break;
     case ui::AX_EVENT_ALERT:
       // An alert is a special case of live region. Fall through to the
       // next case to handle it.
     case ui::AX_EVENT_SHOW: {
       // This event is fired when an object appears in a live region.
       // Speak its text.
       Java_BrowserAccessibilityManager_announceLiveRegionText(
-          env, obj.obj(),
-          base::android::ConvertUTF16ToJavaString(
-              env, android_node->GetText()).obj());
+          env, obj, base::android::ConvertUTF16ToJavaString(
+                        env, android_node->GetText()));
       break;
     }
     case ui::AX_EVENT_TEXT_SELECTION_CHANGED:
       Java_BrowserAccessibilityManager_handleTextSelectionChanged(
-          env, obj.obj(), node->unique_id());
+          env, obj, node->unique_id());
       break;
     case ui::AX_EVENT_TEXT_CHANGED:
     case ui::AX_EVENT_VALUE_CHANGED:
       if (android_node->IsEditableText() && GetFocus() == node) {
         Java_BrowserAccessibilityManager_handleEditableTextChanged(
-            env, obj.obj(), node->unique_id());
+            env, obj, node->unique_id());
       } else if (android_node->IsSlider()) {
-        Java_BrowserAccessibilityManager_handleSliderChanged(
-            env, obj.obj(), node->unique_id());
+        Java_BrowserAccessibilityManager_handleSliderChanged(env, obj,
+                                                             node->unique_id());
       }
       break;
     default:
       // There are some notifications that aren't meaningful on Android.
       // It's okay to skip them.
       break;
   }
 }
 
 void BrowserAccessibilityManagerAndroid::SendLocationChangeEvents(
       const std::vector<AccessibilityHostMsg_LocationChangeParams>& params) {
   // Android is not very efficient at handling notifications, and location
   // changes in particular are frequent and not time-critical. If a lot of
   // nodes changed location, just send a single notification after a short
   // delay (to batch them), rather than lots of individual notifications.
   if (params.size() > 3) {
     ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
     JNIEnv* env = AttachCurrentThread();
     if (obj.is_null())
       return;
-    Java_BrowserAccessibilityManager_sendDelayedWindowContentChangedEvent(
-        env, obj.obj());
+    Java_BrowserAccessibilityManager_sendDelayedWindowContentChangedEvent(env,
+                                                                          obj);
     return;
   }
 
   BrowserAccessibilityManager::SendLocationChangeEvents(params);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 BrowserAccessibilityManagerAndroid::GetSupportedHtmlElementTypes(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
@@ skipping 98 matching lines @@
       node->CanScrollDown(),
       node->CanScrollLeft(),
       node->CanScrollRight(),
       node->IsClickable(),
       node->IsEditableText(),
       node->IsEnabled(),
       node->IsFocusable(),
       node->IsFocused());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoClassName(
       env, obj, info,
-      base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
+      base::android::ConvertUTF8ToJavaString(env, node->GetClassName()));
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoText(
       env, obj, info,
-      base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
-      node->IsLink(),
-      node->IsEditableText());
+      base::android::ConvertUTF16ToJavaString(env, node->GetText()),
+      node->IsLink(), node->IsEditableText());
   base::string16 element_id;
   if (node->GetHtmlAttribute("id", &element_id)) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoViewIdResourceName(
         env, obj, info,
-        base::android::ConvertUTF16ToJavaString(env, element_id).obj());
+        base::android::ConvertUTF16ToJavaString(env, element_id));
   }
 
   gfx::Rect absolute_rect = node->GetPageBoundsRect();
   gfx::Rect parent_relative_rect = absolute_rect;
   if (node->GetParent()) {
     gfx::Rect parent_rect = node->GetParent()->GetPageBoundsRect();
     parent_relative_rect.Offset(-parent_rect.OffsetFromOrigin());
   }
   bool is_root = node->GetParent() == NULL;
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLocation(
       env, obj, info,
       id,
       absolute_rect.x(), absolute_rect.y(),
       parent_relative_rect.x(), parent_relative_rect.y(),
       absolute_rect.width(), absolute_rect.height(),
       is_root);
 
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoKitKatAttributes(
-      env, obj, info,
-      is_root,
-      node->IsEditableText(),
-      base::android::ConvertUTF16ToJavaString(
-          env, node->GetRoleDescription()).obj());
+      env, obj, info, is_root, node->IsEditableText(),
+      base::android::ConvertUTF16ToJavaString(env, node->GetRoleDescription()));
 
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLollipopAttributes(
       env, obj, info,
       node->CanOpenPopup(),
       node->IsContentInvalid(),
       node->IsDismissable(),
       node->IsMultiLine(),
       node->AndroidInputType(),
       node->AndroidLiveRegionType());
   if (node->IsCollection()) {
@@ skipping 35 matching lines @@
     return false;
 
   Java_BrowserAccessibilityManager_setAccessibilityEventBooleanAttributes(
       env, obj, event,
       node->IsChecked(),
       node->IsEnabled(),
       node->IsPassword(),
       node->IsScrollable());
   Java_BrowserAccessibilityManager_setAccessibilityEventClassName(
       env, obj, event,
-      base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
+      base::android::ConvertUTF8ToJavaString(env, node->GetClassName()));
   Java_BrowserAccessibilityManager_setAccessibilityEventListAttributes(
       env, obj, event,
       node->GetItemIndex(),
       node->GetItemCount());
   Java_BrowserAccessibilityManager_setAccessibilityEventScrollAttributes(
       env, obj, event,
       node->GetScrollX(),
       node->GetScrollY(),
       node->GetMaxScrollX(),
       node->GetMaxScrollY());
 
   switch (event_type) {
     case ANDROID_ACCESSIBILITY_EVENT_TEXT_CHANGED: {
       base::string16 before_text = node->GetTextChangeBeforeText();
       base::string16 text = node->GetText();
       Java_BrowserAccessibilityManager_setAccessibilityEventTextChangedAttrs(
-          env, obj, event,
-          node->GetTextChangeFromIndex(),
-          node->GetTextChangeAddedCount(),
-          node->GetTextChangeRemovedCount(),
-          base::android::ConvertUTF16ToJavaString(
-              env, before_text).obj(),
-          base::android::ConvertUTF16ToJavaString(env, text).obj());
+          env, obj, event, node->GetTextChangeFromIndex(),
+          node->GetTextChangeAddedCount(), node->GetTextChangeRemovedCount(),
+          base::android::ConvertUTF16ToJavaString(env, before_text),
+          base::android::ConvertUTF16ToJavaString(env, text));
       break;
     }
     case ANDROID_ACCESSIBILITY_EVENT_TEXT_SELECTION_CHANGED: {
       base::string16 text = node->GetText();
       Java_BrowserAccessibilityManager_setAccessibilityEventSelectionAttrs(
-          env, obj, event,
-          node->GetSelectionStart(),
-          node->GetSelectionEnd(),
+          env, obj, event, node->GetSelectionStart(), node->GetSelectionEnd(),
           node->GetEditableTextLength(),
-          base::android::ConvertUTF16ToJavaString(env, text).obj());
+          base::android::ConvertUTF16ToJavaString(env, text));
       break;
     }
     default:
       break;
   }
 
   Java_BrowserAccessibilityManager_setAccessibilityEventLollipopAttributes(
       env, obj, event,
       node->CanOpenPopup(),
       node->IsContentInvalid(),
@@ skipping 133 matching lines @@
   while (ancestor && ancestor != GetRoot()) {
     if (ancestor->PlatformIsLeaf() ||
         (ancestor->IsFocusable() && !ancestor->HasFocusableChild())) {
       node = ancestor;
       // Don't break - we want the highest ancestor that's focusable or a
       // leaf node.
     }
     ancestor = static_cast<BrowserAccessibilityAndroid*>(ancestor->GetParent());
   }
 
-  Java_BrowserAccessibilityManager_handleHover(
-      env, obj.obj(), node->unique_id());
+  Java_BrowserAccessibilityManager_handleHover(env, obj, node->unique_id());
 }
 
 jint BrowserAccessibilityManagerAndroid::FindElementType(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint start_id,
     const JavaParamRef<jstring>& element_type_str,
     jboolean forwards) {
   BrowserAccessibilityAndroid* start_node = GetFromUniqueID(start_id);
   if (!start_node)
@@ skipping 37 matching lines @@
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (!node)
     return false;
 
   jint start_index = -1;
   int end_index = -1;
   if (NextAtGranularity(granularity, cursor_index, node,
                         &start_index, &end_index)) {
     base::string16 text = node->GetText();
     Java_BrowserAccessibilityManager_finishGranularityMove(
-        env, obj, base::android::ConvertUTF16ToJavaString(
-            env, text).obj(),
+        env, obj, base::android::ConvertUTF16ToJavaString(env, text),
         extend_selection, start_index, end_index, true);
     return true;
   }
   return false;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::PreviousAtGranularity(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint granularity,
     jboolean extend_selection,
     jint id,
     jint cursor_index) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (!node)
     return false;
 
   jint start_index = -1;
   int end_index = -1;
   if (PreviousAtGranularity(granularity, cursor_index, node,
                             &start_index, &end_index)) {
     Java_BrowserAccessibilityManager_finishGranularityMove(
-        env, obj, base::android::ConvertUTF16ToJavaString(
-            env, node->GetText()).obj(),
+        env, obj, base::android::ConvertUTF16ToJavaString(env, node->GetText()),
         extend_selection, start_index, end_index, false);
     return true;
   }
   return false;
 }
 
 bool BrowserAccessibilityManagerAndroid::NextAtGranularity(
     int32_t granularity,
     int32_t cursor_index,
     BrowserAccessibilityAndroid* node,
@@ skipping 121 matching lines @@
     const std::vector<ui::AXTreeDelegate::Change>& changes) {
   BrowserAccessibilityManager::OnAtomicUpdateFinished(
       tree, root_changed, changes);
 
   if (root_changed) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
     if (obj.is_null())
       return;
 
-    Java_BrowserAccessibilityManager_handleNavigate(env, obj.obj());
+    Java_BrowserAccessibilityManager_handleNavigate(env, obj);
   }
 }
 
 bool
 BrowserAccessibilityManagerAndroid::UseRootScrollOffsetsWhenComputingBounds() {
   // The Java layer handles the root scroll offset.
   return false;
 }
 
 BrowserAccessibilityAndroid*
@@ skipping 12 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content