ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h

ceee/ie/broker/cookie_api_module.cc

Index: ceee/ie/broker/cookie_api_module.cc
diff --git a/ceee/ie/broker/cookie_api_module.cc b/ceee/ie/broker/cookie_api_module.cc
index 52e74038d1efa426d0f516cac5aecd39eff3c0bd..56b28d4d48a9e0c3fda301c1b5f2a1675b105532 100644
--- a/ceee/ie/broker/cookie_api_module.cc
+++ b/ceee/ie/broker/cookie_api_module.cc
@@ -11,9 +11,9 @@
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/win/scoped_bstr.h"
+#include "base/win/scoped_comptr.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/common/process_utils_win.h"
 #include "ceee/common/window_utils.h"
@@ -67,7 +67,7 @@ bool CookieApiResult::GetTabListForWindow(HWND window,
   DCHECK(tab_list);
   ApiDispatcher* dispatcher = GetDispatcher();
   DCHECK(dispatcher);
-  ScopedComPtr<ICeeeWindowExecutor> executor;
+  base::win::ScopedComPtr<ICeeeWindowExecutor> executor;
   dispatcher->GetExecutor(window, IID_ICeeeWindowExecutor,
                           reinterpret_cast<void**>(executor.Receive()));
   if (executor == NULL) {
@@ -134,7 +134,7 @@ bool CookieApiResult::GetTabProtectedMode(HWND tab_window,
   }
   ApiDispatcher* dispatcher = GetDispatcher();
   DCHECK(dispatcher);
-  ScopedComPtr<ICeeeTabExecutor> executor;
+  base::win::ScopedComPtr<ICeeeTabExecutor> executor;
   dispatcher->GetExecutor(tab_window, IID_ICeeeTabExecutor,
                           reinterpret_cast<void**>(executor.Receive()));
   if (executor == NULL) {
@@ -164,7 +164,7 @@ HRESULT CookieApiResult::GetCookieInfo(
 
   ApiDispatcher* dispatcher = GetDispatcher();
   DCHECK(dispatcher);
-  ScopedComPtr<ICeeeCookieExecutor> executor;
+  base::win::ScopedComPtr<ICeeeCookieExecutor> executor;
   dispatcher->GetExecutor(tab_window, IID_ICeeeCookieExecutor,
                           reinterpret_cast<void**>(executor.Receive()));
   if (executor == NULL) {
@@ -229,7 +229,7 @@ bool CookieApiResult::CreateCookieStoreValues(DWORD process_id,
 HRESULT CookieApiResult::RegisterCookieStore(HWND window) {
   ApiDispatcher* dispatcher = GetDispatcher();
   DCHECK(dispatcher);
-  ScopedComPtr<ICeeeCookieExecutor> executor;
+  base::win::ScopedComPtr<ICeeeCookieExecutor> executor;
   dispatcher->GetExecutor(window, IID_ICeeeCookieExecutor,
                           reinterpret_cast<void**>(executor.Receive()));
   if (executor == NULL) {
@@ -249,7 +249,7 @@ HRESULT CookieApiResult::RegisterCookieStore(HWND window) {
 HRESULT CookieApiResult::CookieStoreIsRegistered(HWND window) {
   ApiDispatcher* dispatcher = GetDispatcher();
   DCHECK(dispatcher);
-  ScopedComPtr<ICeeeCookieExecutor> executor;
+  base::win::ScopedComPtr<ICeeeCookieExecutor> executor;
   dispatcher->GetExecutor(window, IID_ICeeeCookieExecutor,
                           reinterpret_cast<void**>(executor.Receive()));
   if (executor == NULL) {