Remove ScopedComPtr::CreateInstance()

content/renderer/gpu/gpu_benchmarking_extension.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/renderer/gpu/gpu_benchmarking_extension.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 45 matching lines @@
 #include "third_party/skia/include/core/SkStream.h"
 // Note that headers in third_party/skia/src are fragile.  This is
 // an experimental, fragile, and diagnostic-only document type.
 #include "third_party/skia/src/utils/SkMultiPictureDocument.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_WIN) && !defined(NDEBUG)
 #include <XpsObjectModel.h>
+#include <objbase.h>
 #include "base/win/scoped_comptr.h"
 #endif
 
 using blink::WebCanvas;
 using blink::WebLocalFrame;
 using blink::WebImageCache;
 using blink::WebPrivatePtr;
 using blink::WebSize;
 using blink::WebView;
 
@@ skipping 446 matching lines @@
 // Also note:  You must execute Chrome with `--no-sandbox` and
 // `--enable-gpu-benchmarking` for this to work.
 #if defined(OS_WIN) && !defined(NDEBUG)
 static sk_sp<SkDocument> MakeXPSDocument(SkWStream* s) {
   // I am not sure why this hasn't been initialized yet.
   (void)CoInitializeEx(nullptr,
                        COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
   // In non-sandboxed mode, we will need to create and hold on to the
   // factory before entering the sandbox.
   base::win::ScopedComPtr<IXpsOMObjectFactory> factory;
-  HRESULT hr = factory.CreateInstance(CLSID_XpsOMObjectFactory, nullptr,
-                                      CLSCTX_INPROC_SERVER);
+  HRESULT hr = ::CoCreateInstance(CLSID_XpsOMObjectFactory, nullptr,
+                                  CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&factory));
   if (FAILED(hr) || !factory) {
     LOG(ERROR) << "CoCreateInstance(CLSID_XpsOMObjectFactory, ...) failed:"
                << logging::SystemErrorCodeToString(hr);
   }
   return SkDocument::MakeXPS(s, factory.Get());
 }
 #endif
 }  // namespace
 
 gin::WrapperInfo GpuBenchmarking::kWrapperInfo = {gin::kEmbedderNativeGin};
@@ skipping 588 matching lines @@
           &gpu_driver_bug_workarounds))) {
     return;
   }
 
   v8::Local<v8::Value> result;
   if (gin::TryConvertToV8(args->isolate(), gpu_driver_bug_workarounds, &result))
     args->Return(result);
 }
 
 }  // namespace content