Remove ScopedComPtr and scoped_comptr.h

https://chromium-review.googlesource.com/726461

atom/browser/native_window_views.cc

@@ -6,6 +6,7 @@
 
 #if defined(OS_WIN)
 #include <objbase.h>
+#include <wrl/client.h>
 #endif
 
 #include <vector>
@@ -741,7 +742,7 @@ void NativeWindowViews::FlashFrame(bool flash) {
 
 void NativeWindowViews::SetSkipTaskbar(bool skip) {
 #if defined(OS_WIN)
-  base::win::ScopedComPtr<ITaskbarList> taskbar;
+  Microsoft::WRL::ComPtr<ITaskbarList> taskbar;
   if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
                                 CLSCTX_INPROC_SERVER,
                                 IID_PPV_ARGS(&taskbar))) ||

atom/browser/ui/win/taskbar_host.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_UI_WIN_TASKBAR_HOST_H_
 
 #include <shobjidl.h>
+#include <wrl/client.h>
 
 #include <map>
 #include <string>
@@ -13,7 +14,6 @@
 
 #include "atom/browser/native_window.h"
 #include "base/callback.h"
-#include "base/win/scoped_comptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
@@ -66,7 +66,7 @@ class TaskbarHost {
   std::vector<ThumbarButton> last_buttons_;
 
   // The COM object of taskbar.
-  base::win::ScopedComPtr<ITaskbarList3> taskbar_;
+  Microsoft::WRL::ComPtr<ITaskbarList3> taskbar_;
 
   // Whether we have already added the buttons to thumbar.
   bool thumbar_buttons_added_ = false;