BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 3 insertions, 35 deletions

diff --git a/chromium/base/win/scoped_variant_unittest.cc b/chromium/base/win/scoped_variant_unittest.cc
index 31575846bc7..437efc2298b 100644
--- a/chromium/base/win/scoped_variant_unittest.cc
+++ b/chromium/base/win/scoped_variant_unittest.cc
@@ -8,9 +8,12 @@
 
 #include <utility>
 
+#include "base/win/dispatch_stub.h"
 #include "base/win/scoped_variant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::win::test::DispatchStub;
+
 namespace base {
 namespace win {
 
@@ -28,41 +31,6 @@ void InitializeVariantWithBstr(VARIANT* var) {
   V_BSTR(var) = ::SysAllocString(kTestString);
 }
 
-// An unimplemented IDispatch subclass.
-class DispatchStub
-    : public Microsoft::WRL::RuntimeClass<
-          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
-          IDispatch> {
- public:
-  DispatchStub() = default;
-  DispatchStub(const DispatchStub&) = delete;
-  DispatchStub& operator=(const DispatchStub&) = delete;
-
-  // IDispatch:
-  IFACEMETHODIMP GetTypeInfoCount(UINT*) override { return E_NOTIMPL; }
-  IFACEMETHODIMP GetTypeInfo(UINT, LCID, ITypeInfo**) override {
-    return E_NOTIMPL;
-  }
-  IFACEMETHODIMP GetIDsOfNames(REFIID,
-                               LPOLESTR*,
-                               UINT,
-                               LCID,
-                               DISPID*) override {
-    return E_NOTIMPL;
-  }
-
-  IFACEMETHODIMP Invoke(DISPID,
-                        REFIID,
-                        LCID,
-                        WORD,
-                        DISPPARAMS*,
-                        VARIANT*,
-                        EXCEPINFO*,
-                        UINT*) override {
-    return E_NOTIMPL;
-  }
-};
-
 void ExpectRefCount(ULONG expected_refcount, IUnknown* object) {
   // In general, code should not check the values of AddRef() and Release().
   // However, tests need to validate that ScopedVariant safely owns a COM object