Convert TSFEventRouter CComPtr Uses to ComPtr

BUG=5027

Change-Id: Ieb23ffe8279fbdab9fdf7357916312ec534793af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885630
Auto-Submit: Robert Liao <robliao@chromium.org>
Commit-Queue: Yohei Yukawa <yukawa@chromium.org>
Reviewed-by: Yohei Yukawa <yukawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711541}

ui/base/ime/win/tsf_event_router.cc

@@ -5,11 +5,11 @@
 #include "ui/base/ime/win/tsf_event_router.h"
 
 #include <msctf.h>
-#include <wrl/client.h>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
+#include "base/win/atl.h"
 #include "ui/base/win/atl_module.h"
 #include "ui/gfx/range/range.h"
 
@@ -256,8 +256,7 @@ TSFEventRouter::TSFEventRouter(TSFEventRouterObserver* observer)
   CComObject<Delegate>* delegate;
   ui::win::CreateATLModuleIfNeeded();
   if (SUCCEEDED(CComObject<Delegate>::CreateInstance(&delegate))) {
-    delegate->AddRef();
-    delegate_.Attach(delegate);
+    delegate_ = delegate;
     delegate_->SetRouter(this);
   }
 }

ui/base/ime/win/tsf_event_router.h

@@ -6,13 +6,13 @@
 #define UI_BASE_IME_WIN_TSF_EVENT_ROUTER_H_
 
 #include <msctf.h>
+#include <wrl/client.h>
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/component_export.h"
-#include "base/win/atl.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/range/range.h"
 
@@ -65,7 +65,7 @@ class COMPONENT_EXPORT(UI_BASE_IME_WIN) TSFEventRouter {
  private:
   class Delegate;
 
-  CComPtr<Delegate> delegate_;
+  Microsoft::WRL::ComPtr<Delegate> delegate_;
 
   TSFEventRouterObserver* observer_;