base: Remove operator& from ScopedVariant and ScopedPropVariant.

content/browser/accessibility/accessibility_win_browsertest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/win/scoped_bstr.h"
@@ skipping 261 matching lines @@
   std::wstring name(name_bstr, name_bstr.Length());
   base::win::ScopedVariant role;
   node->get_accRole(childid_self, role.Receive());
   ASSERT_EQ(VT_I4, role.type());
 
   // Print the accessibility tree as we go, because if this test fails
   // on the bots, this is really helpful in figuring out why.
   for (int i = 0; i < depth; i++)
     printf("  ");
   printf("role=%s name=%s\n",
-      base::WideToUTF8(IAccessibleRoleToString(V_I4(&role))).c_str(),
-      base::WideToUTF8(name).c_str());
+         base::WideToUTF8(IAccessibleRoleToString(V_I4(role.ptr()))).c_str(),
+         base::WideToUTF8(name).c_str());
 
-  if (expected_role == V_I4(&role) && expected_name == name) {
+  if (expected_role == V_I4(role.ptr()) && expected_name == name) {
     *found = true;
     return;
   }
 
   std::vector<base::win::ScopedVariant> children = GetAllAccessibleChildren(
       node);
   for (size_t i = 0; i < children.size(); ++i) {
     base::win::ScopedComPtr<IAccessible> child_accessible(
         GetAccessibleFromVariant(node, children[i].AsInput()));
     if (child_accessible) {
@@ skipping 225 matching lines @@
 
 void AccessibilityWinBrowserTest::AccessibleChecker::CheckAccessibleValue(
     IAccessible* accessible) {
   // Don't check the value if if's a DOCUMENT role, because the value
   // is supposed to be the url (and we don't keep track of that in the
   // test expectations).
   base::win::ScopedVariant role;
   base::win::ScopedVariant childid_self(CHILDID_SELF);
   HRESULT hr = accessible->get_accRole(childid_self, role.Receive());
   ASSERT_EQ(S_OK, hr);
-  if (role.type() == VT_I4 && V_I4(&role) == ROLE_SYSTEM_DOCUMENT)
+  if (role.type() == VT_I4 && V_I4(role.ptr()) == ROLE_SYSTEM_DOCUMENT)
     return;
 
   // Get the value.
   base::win::ScopedBstr value;
   hr = accessible->get_accValue(childid_self, value.Receive());
   EXPECT_EQ(S_OK, hr);
 
   // Test that the correct string was returned.
   EXPECT_EQ(value_, std::wstring(value, value.Length()));
 }
 
 void AccessibilityWinBrowserTest::AccessibleChecker::CheckAccessibleState(
     IAccessible* accessible) {
   if (state_ < 0)
     return;
 
   base::win::ScopedVariant state;
   base::win::ScopedVariant childid_self(CHILDID_SELF);
   HRESULT hr = accessible->get_accState(childid_self, state.Receive());
   EXPECT_EQ(S_OK, hr);
   ASSERT_EQ(VT_I4, state.type());
-  LONG obj_state = V_I4(&state);
+  LONG obj_state = V_I4(state.ptr());
   // Avoid flakiness. The "offscreen" state depends on whether the browser
   // window is frontmost or not, and "hottracked" depends on whether the
   // mouse cursor happens to be over the element.
   obj_state &= ~(STATE_SYSTEM_OFFSCREEN | STATE_SYSTEM_HOTTRACKED);
   EXPECT_EQ(state_, obj_state)
     << "Expected state: " << IAccessibleStateToString(state_)
     << "\nGot state: " << IAccessibleStateToString(obj_state);
 }
 
 void AccessibilityWinBrowserTest::AccessibleChecker::CheckAccessibleChildren(
@@ skipping 14 matching lines @@
         GetAccessibleFromVariant(parent, child->AsInput()));
     ASSERT_TRUE(child_accessible.get());
     (*child_checker)->CheckAccessible(child_accessible.get());
   }
 }
 
 base::string16
 AccessibilityWinBrowserTest::AccessibleChecker::RoleVariantToString(
     const base::win::ScopedVariant& role) {
   if (role.type() == VT_I4)
-    return IAccessibleRoleToString(V_I4(&role));
+    return IAccessibleRoleToString(V_I4(role.ptr()));
   if (role.type() == VT_BSTR)
-    return base::string16(V_BSTR(&role), SysStringLen(V_BSTR(&role)));
+    return base::string16(V_BSTR(role.ptr()), SysStringLen(V_BSTR(role.ptr())));
   return base::string16();
 }
 
 }  // namespace
 
 
 // Tests ----------------------------------------------------------------------
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestBusyAccessibilityTree) {
@@ skipping 860 matching lines @@
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestMultiLineTextAtOffsetWithBoundaryAll) {
   base::win::ScopedComPtr<IAccessibleText> textarea_text;
   SetUpTextareaField(&textarea_text);
 
   CheckTextAtOffset(textarea_text, CONTENTS_LENGTH - 1, IA2_TEXT_BOUNDARY_ALL,
       0, CONTENTS_LENGTH, base::SysUTF8ToWide(TEXTAREA_CONTENTS));
 }
 
 }  // namespace content