Rename ScopedComPtr::Release() to ScopedComPtr::Reset()

content/browser/accessibility/browser_accessibility_win_unittest.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/accessibility/browser_accessibility_win.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 213 matching lines @@
   hr = text_dispatch.QueryInterface(text_accessible.Receive());
   ASSERT_EQ(S_OK, hr);
 
   base::win::ScopedVariant childid_self(CHILDID_SELF);
   base::win::ScopedBstr name;
   hr = text_accessible->get_accName(childid_self, name.Receive());
   ASSERT_EQ(S_OK, hr);
   EXPECT_EQ(L"old text", base::string16(name));
   name.Reset();
 
-  text_dispatch.Release();
-  text_accessible.Release();
+  text_dispatch.Reset();
+  text_accessible.Reset();
 
   // Notify the BrowserAccessibilityManager that the text child has changed.
   AXContentNodeData text2;
   text2.id = 2;
   text2.role = ui::AX_ROLE_STATIC_TEXT;
   text2.SetName("new text");
   AXEventNotificationDetails param;
   param.event_type = ui::AX_EVENT_CHILDREN_CHANGED;
   param.update.nodes.push_back(text2);
   param.id = text2.id;
   std::vector<AXEventNotificationDetails> events;
   events.push_back(param);
   manager->OnAccessibilityEvents(events);
 
   // Query for the text IAccessible and verify that it now returns "new text"
   // as its value.
   hr = ToBrowserAccessibilityWin(manager->GetRoot())->get_accChild(
       one, text_dispatch.Receive());
   ASSERT_EQ(S_OK, hr);
 
   hr = text_dispatch.QueryInterface(text_accessible.Receive());
   ASSERT_EQ(S_OK, hr);
 
   hr = text_accessible->get_accName(childid_self, name.Receive());
   ASSERT_EQ(S_OK, hr);
   EXPECT_EQ(L"new text", base::string16(name));
 
-  text_dispatch.Release();
-  text_accessible.Release();
+  text_dispatch.Reset();
+  text_accessible.Reset();
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
   // Create ui::AXNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
@@ skipping 389 matching lines @@
   EXPECT_EQ(E_INVALIDARG, root_obj->get_hyperlink(4, hyperlink.Receive()));
 
   // Get the text of the combo box.
   // It should be its value.
   EXPECT_EQ(S_OK, root_obj->get_hyperlink(0, hyperlink.Receive()));
   EXPECT_EQ(S_OK, hyperlink.QueryInterface(hypertext.Receive()));
   EXPECT_EQ(S_OK,
             hypertext->get_text(0, IA2_TEXT_OFFSET_LENGTH, text.Receive()));
   EXPECT_STREQ(combo_box_value.c_str(), text);
   text.Reset();
-  hyperlink.Release();
-  hypertext.Release();
+  hyperlink.Reset();
+  hypertext.Reset();
 
   // Get the text of the check box.
   // It should be its name.
   EXPECT_EQ(S_OK, root_obj->get_hyperlink(1, hyperlink.Receive()));
   EXPECT_EQ(S_OK, hyperlink.QueryInterface(hypertext.Receive()));
   EXPECT_EQ(S_OK,
             hypertext->get_text(0, IA2_TEXT_OFFSET_LENGTH, text.Receive()));
   EXPECT_STREQ(check_box_name.c_str(), text);
   text.Reset();
-  hyperlink.Release();
-  hypertext.Release();
+  hyperlink.Reset();
+  hypertext.Reset();
 
   // Get the text of the button.
   EXPECT_EQ(S_OK, root_obj->get_hyperlink(2, hyperlink.Receive()));
   EXPECT_EQ(S_OK, hyperlink.QueryInterface(hypertext.Receive()));
   EXPECT_EQ(S_OK,
             hypertext->get_text(0, IA2_TEXT_OFFSET_LENGTH, text.Receive()));
   EXPECT_STREQ(button_text_name.c_str(), text);
   text.Reset();
-  hyperlink.Release();
-  hypertext.Release();
+  hyperlink.Reset();
+  hypertext.Reset();
 
   // Get the text of the link.
   EXPECT_EQ(S_OK, root_obj->get_hyperlink(3, hyperlink.Receive()));
   EXPECT_EQ(S_OK, hyperlink.QueryInterface(hypertext.Receive()));
   EXPECT_EQ(S_OK, hypertext->get_text(0, 4, text.Receive()));
   EXPECT_STREQ(link_text_name.c_str(), text);
   text.Reset();
-  hyperlink.Release();
-  hypertext.Release();
+  hyperlink.Reset();
+  hypertext.Reset();
 
   long hyperlink_index;
   EXPECT_EQ(S_FALSE, root_obj->get_hyperlinkIndex(0, &hyperlink_index));
   EXPECT_EQ(-1, hyperlink_index);
   // Invalid arguments should not be modified.
   hyperlink_index = -2;
   EXPECT_EQ(E_INVALIDARG,
             root_obj->get_hyperlinkIndex(root_hypertext_len, &hyperlink_index));
   EXPECT_EQ(-2, hyperlink_index);
   EXPECT_EQ(S_OK, root_obj->get_hyperlinkIndex(14, &hyperlink_index));
@@ skipping 457 matching lines @@
     EXPECT_EQ(offset, start);
     EXPECT_LT(offset, end);
     LONG space_offset = static_cast<LONG>(line1.find(' ', offset));
     EXPECT_EQ(space_offset + 1, end);
     LONG length = end - start;
     EXPECT_STREQ(text.substr(start, length).c_str(), word);
     word.Reset();
     offset = end;
   }
 
-  textarea_object.Release();
-  text_field_object.Release();
+  textarea_object.Reset();
+  text_field_object.Reset();
 
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 TEST_F(BrowserAccessibilityTest, TestCaretAndSelectionInSimpleFields) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.state = (1 << ui::AX_STATE_READ_ONLY) | (1 << ui::AX_STATE_FOCUSABLE);
@@ skipping 428 matching lines @@
   base::win::ScopedVariant anchor;
   base::win::ScopedVariant anchor_target;
   base::win::ScopedBstr bstr;
 
   base::string16 div_hypertext(L"Click ");
   div_hypertext.push_back(BrowserAccessibilityWin::kEmbeddedCharacter);
 
   // div_accessible and link_accessible are the only IA2 hyperlinks.
   EXPECT_HRESULT_FAILED(root_accessible->QueryInterface(
       IID_IAccessibleHyperlink, reinterpret_cast<void**>(hyperlink.Receive())));
-  hyperlink.Release();
+  hyperlink.Reset();
   EXPECT_HRESULT_SUCCEEDED(div_accessible->QueryInterface(
       IID_IAccessibleHyperlink, reinterpret_cast<void**>(hyperlink.Receive())));
-  hyperlink.Release();
+  hyperlink.Reset();
   EXPECT_HRESULT_FAILED(text_accessible->QueryInterface(
       IID_IAccessibleHyperlink, reinterpret_cast<void**>(hyperlink.Receive())));
-  hyperlink.Release();
+  hyperlink.Reset();
   EXPECT_HRESULT_SUCCEEDED(link_accessible->QueryInterface(
       IID_IAccessibleHyperlink, reinterpret_cast<void**>(hyperlink.Receive())));
-  hyperlink.Release();
+  hyperlink.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(root_accessible->nActions(&n_actions));
   EXPECT_EQ(0, n_actions);
   EXPECT_HRESULT_SUCCEEDED(div_accessible->nActions(&n_actions));
   EXPECT_EQ(1, n_actions);
   EXPECT_HRESULT_SUCCEEDED(text_accessible->nActions(&n_actions));
   EXPECT_EQ(0, n_actions);
   EXPECT_HRESULT_SUCCEEDED(link_accessible->nActions(&n_actions));
   EXPECT_EQ(1, n_actions);
 
@@ skipping 754 matching lines @@
   relation_type.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(describedby_relation->get_nTargets(&n_targets));
   EXPECT_EQ(2, n_targets);
 
   EXPECT_HRESULT_SUCCEEDED(
       describedby_relation->get_target(0, target.Receive()));
   target.QueryInterface(ax_target.Receive());
   EXPECT_HRESULT_SUCCEEDED(ax_target->get_uniqueID(&unique_id));
   EXPECT_EQ(-ax_child1->unique_id(), unique_id);
-  ax_target.Release();
-  target.Release();
+  ax_target.Reset();
+  target.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(
       describedby_relation->get_target(1, target.Receive()));
   target.QueryInterface(ax_target.Receive());
   EXPECT_HRESULT_SUCCEEDED(ax_target->get_uniqueID(&unique_id));
   EXPECT_EQ(-ax_child2->unique_id(), unique_id);
-  ax_target.Release();
-  target.Release();
-  describedby_relation.Release();
+  ax_target.Reset();
+  target.Reset();
+  describedby_relation.Reset();
 
   // Test the reverse relations.
   EXPECT_HRESULT_SUCCEEDED(ax_child1->get_nRelations(&n_relations));
   EXPECT_EQ(1, n_relations);
 
   EXPECT_HRESULT_SUCCEEDED(
       ax_child1->get_relation(0, description_for_relation.Receive()));
   EXPECT_HRESULT_SUCCEEDED(
       description_for_relation->get_relationType(relation_type.Receive()));
   EXPECT_EQ(L"descriptionFor", base::string16(relation_type));
   relation_type.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(description_for_relation->get_nTargets(&n_targets));
   EXPECT_EQ(1, n_targets);
 
   EXPECT_HRESULT_SUCCEEDED(
       description_for_relation->get_target(0, target.Receive()));
   target.QueryInterface(ax_target.Receive());
   EXPECT_HRESULT_SUCCEEDED(ax_target->get_uniqueID(&unique_id));
   EXPECT_EQ(-ax_root->unique_id(), unique_id);
-  ax_target.Release();
-  target.Release();
-  description_for_relation.Release();
+  ax_target.Reset();
+  target.Reset();
+  description_for_relation.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(ax_child2->get_nRelations(&n_relations));
   EXPECT_EQ(1, n_relations);
 
   EXPECT_HRESULT_SUCCEEDED(
       ax_child2->get_relation(0, description_for_relation.Receive()));
   EXPECT_HRESULT_SUCCEEDED(
       description_for_relation->get_relationType(relation_type.Receive()));
   EXPECT_EQ(L"descriptionFor", base::string16(relation_type));
   relation_type.Reset();
 
   EXPECT_HRESULT_SUCCEEDED(description_for_relation->get_nTargets(&n_targets));
   EXPECT_EQ(1, n_targets);
 
   EXPECT_HRESULT_SUCCEEDED(
       description_for_relation->get_target(0, target.Receive()));
   target.QueryInterface(ax_target.Receive());
   EXPECT_HRESULT_SUCCEEDED(ax_target->get_uniqueID(&unique_id));
   EXPECT_EQ(-ax_root->unique_id(), unique_id);
-  ax_target.Release();
-  target.Release();
+  ax_target.Reset();
+  target.Reset();
 
   // Try adding one more relation.
   std::vector<int32_t> labelledby_ids = {3};
   child1.AddIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS, labelledby_ids);
   AXEventNotificationDetails event;
   event.event_type = ui::AX_EVENT_ARIA_ATTRIBUTE_CHANGED;
   event.update.nodes.push_back(child1);
   event.id = child1.id;
   std::vector<AXEventNotificationDetails> events = {event};
   manager->OnAccessibilityEvents(events);
 
   EXPECT_HRESULT_SUCCEEDED(ax_child1->get_nRelations(&n_relations));
   EXPECT_EQ(2, n_relations);
   EXPECT_HRESULT_SUCCEEDED(ax_child2->get_nRelations(&n_relations));
   EXPECT_EQ(2, n_relations);
 }
 
 }  // namespace content