Convert Content CComPtr Uses to ComPtr

BUG=5027

Change-Id: If972ad1381437b116f3279a3a51480dd2098d564
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904495
Commit-Queue: Scott Violet <sky@chromium.org>
Auto-Submit: Robert Liao <robliao@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713679}

content/browser/accessibility/accessibility_win_browsertest.cc

@@ -3788,10 +3788,10 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestIScrollProvider) {
 
     BrowserAccessibilityComWin* browser_accessibility_com_win =
         ToBrowserAccessibilityWin(browser_accessibility)->GetCOM();
-    CComPtr<IScrollProvider> scroll_provider;
+    Microsoft::WRL::ComPtr<IScrollProvider> scroll_provider;
 
     EXPECT_HRESULT_SUCCEEDED(browser_accessibility_com_win->GetPatternProvider(
-        UIA_ScrollPatternId, reinterpret_cast<IUnknown**>(&scroll_provider)));
+        UIA_ScrollPatternId, &scroll_provider));
 
     if (expected.can_scroll_vertical || expected.can_scroll_horizontal) {
       ASSERT_NE(nullptr, scroll_provider);

content/browser/accessibility/ax_platform_node_textprovider_win_browsertest.cc

@@ -23,19 +23,18 @@ using Microsoft::WRL::ComPtr;
 
 namespace content {
 
-#define ASSERT_UIA_SAFEARRAY_OF_TEXTRANGEPROVIDER(safearray, expected_size) \
-  {                                                                         \
-    EXPECT_EQ(sizeof(CComPtr<ITextRangeProvider>),                          \
-              ::SafeArrayGetElemsize(safearray));                           \
-    ASSERT_EQ(1u, SafeArrayGetDim(safearray));                              \
-    LONG array_lower_bound;                                                 \
-    ASSERT_HRESULT_SUCCEEDED(                                               \
-        SafeArrayGetLBound(safearray, 1, &array_lower_bound));              \
-    LONG array_upper_bound;                                                 \
-    ASSERT_HRESULT_SUCCEEDED(                                               \
-        SafeArrayGetUBound(safearray, 1, &array_upper_bound));              \
-    size_t count = array_upper_bound - array_lower_bound + 1;               \
-    ASSERT_EQ(expected_size, count);                                        \
+#define ASSERT_UIA_SAFEARRAY_OF_TEXTRANGEPROVIDER(safearray, expected_size)    \
+  {                                                                            \
+    EXPECT_EQ(sizeof(ITextRangeProvider*), ::SafeArrayGetElemsize(safearray)); \
+    ASSERT_EQ(1u, SafeArrayGetDim(safearray));                                 \
+    LONG array_lower_bound;                                                    \
+    ASSERT_HRESULT_SUCCEEDED(                                                  \
+        SafeArrayGetLBound(safearray, 1, &array_lower_bound));                 \
+    LONG array_upper_bound;                                                    \
+    ASSERT_HRESULT_SUCCEEDED(                                                  \
+        SafeArrayGetUBound(safearray, 1, &array_upper_bound));                 \
+    size_t count = array_upper_bound - array_lower_bound + 1;                  \
+    ASSERT_EQ(expected_size, count);                                           \
   }
 
 #define EXPECT_UIA_TEXTRANGE_EQ(provider, expected_content) \
@@ -172,11 +171,11 @@ IN_PROC_BROWSER_TEST_F(AXPlatformNodeTextProviderWinBrowserTest,
   GetTextProviderFromTextNode(text_provider, node);
 
   base::win::ScopedSafearray text_provider_ranges;
-  CComPtr<ITextRangeProvider>* array_data;
   EXPECT_HRESULT_SUCCEEDED(
       text_provider->GetVisibleRanges(text_provider_ranges.Receive()));
   ASSERT_UIA_SAFEARRAY_OF_TEXTRANGEPROVIDER(text_provider_ranges.Get(), 2U);
 
+  ITextRangeProvider** array_data;
   ASSERT_HRESULT_SUCCEEDED(::SafeArrayAccessData(
       text_provider_ranges.Get(), reinterpret_cast<void**>(&array_data)));
 

content/browser/accessibility/ax_platform_node_textrangeprovider_win_browsertest.cc

@@ -260,7 +260,7 @@ class AXPlatformNodeTextRangeProviderWinBrowserTest
         ToBrowserAccessibilityWin(browser_accessibility_start)->GetCOM();
     ASSERT_NE(nullptr, start_browser_accessibility_com_win);
 
-    CComPtr<ITextRangeProvider> text_range_provider =
+    ComPtr<ITextRangeProvider> text_range_provider =
         ui::AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
             start_browser_accessibility_com_win, std::move(start),
             std::move(end));

content/browser/accessibility/ax_platform_node_win_browsertest.cc

@@ -71,14 +71,15 @@ class AXPlatformNodeWinBrowserTest : public AccessibilityContentBrowserTest {
 
     std::vector<std::string> names;
     for (LONG i = 0; i < size; ++i) {
-      CComPtr<IUnknown> unknown_element = nullptr;
-      ASSERT_HRESULT_SUCCEEDED(SafeArrayGetElement(
-          V_ARRAY(flows_from_variant.ptr()), &i, &unknown_element));
+      ComPtr<IUnknown> unknown_element;
+      ASSERT_HRESULT_SUCCEEDED(
+          SafeArrayGetElement(V_ARRAY(flows_from_variant.ptr()), &i,
+                              static_cast<void**>(&unknown_element)));
       ASSERT_NE(nullptr, unknown_element);
 
-      CComPtr<IRawElementProviderSimple> raw_element_provider_simple = nullptr;
+      ComPtr<IRawElementProviderSimple> raw_element_provider_simple = nullptr;
       ASSERT_HRESULT_SUCCEEDED(
-          unknown_element->QueryInterface(&raw_element_provider_simple));
+          unknown_element.As(&raw_element_provider_simple));
       ASSERT_NE(nullptr, raw_element_provider_simple);
 
       base::win::ScopedVariant name;

content/public/test/browser_test_utils.cc

@@ -135,7 +135,6 @@
 #if defined(OS_WIN)
 #include <uiautomation.h>
 #include <wrl/client.h>
-#include "base/win/atl.h"
 #include "base/win/scoped_safearray.h"
 #include "base/win/scoped_variant.h"
 #endif
@@ -2106,14 +2105,15 @@ void UiaGetPropertyValueVtArrayVtUnknownValidate(
 
   std::vector<std::string> names;
   for (LONG i = 0; i < size; ++i) {
-    CComPtr<IUnknown> unknown_element = nullptr;
-    ASSERT_HRESULT_SUCCEEDED(SafeArrayGetElement(V_ARRAY(result_variant.ptr()),
-                                                 &i, &unknown_element));
+    Microsoft::WRL::ComPtr<IUnknown> unknown_element;
+    ASSERT_HRESULT_SUCCEEDED(
+        SafeArrayGetElement(V_ARRAY(result_variant.ptr()), &i,
+                            static_cast<void**>(&unknown_element)));
     ASSERT_NE(nullptr, unknown_element);
 
-    CComPtr<IRawElementProviderSimple> raw_element_provider_simple = nullptr;
-    ASSERT_HRESULT_SUCCEEDED(
-        unknown_element->QueryInterface(&raw_element_provider_simple));
+    Microsoft::WRL::ComPtr<IRawElementProviderSimple>
+        raw_element_provider_simple;
+    ASSERT_HRESULT_SUCCEEDED(unknown_element.As(&raw_element_provider_simple));
     ASSERT_NE(nullptr, raw_element_provider_simple);
 
     base::win::ScopedVariant name;