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

ceee/ie/broker/cookie_api_module.cc

 // Copyright (c) 2010 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.
 //
 // Cookie API implementation.
 
 #include "ceee/ie/broker/cookie_api_module.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #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"
 #include "ceee/common/windows_constants.h"
 #include "ceee/ie/broker/api_module_constants.h"
 #include "ceee/ie/broker/api_module_util.h"
 #include "ceee/ie/broker/executors_manager.h"
 #include "ceee/ie/broker/tab_api_module.h"
 #include "ceee/ie/broker/window_api_module.h"
 #include "ceee/ie/common/api_registration.h"
@@ skipping 33 matching lines @@
   DCHECK(value() == NULL);
   set_value(cookie.release());
   return true;
 }
 
 bool CookieApiResult::GetTabListForWindow(HWND window,
                                           scoped_ptr<ListValue>* tab_list) {
   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) {
     LOG(WARNING) << "Failed to get an executor to get window tabs.";
     return false;
   }
   base::win::ScopedBstr tab_handles;
   HRESULT hr = executor->GetTabs(tab_handles.Receive());
   if (FAILED(hr)) {
     // No DCHECK, this may happen if the window/thread dies on the way.
@@ skipping 46 matching lines @@
 bool CookieApiResult::GetTabProtectedMode(HWND tab_window,
                                           bool* is_protected_mode) {
   DCHECK(is_protected_mode);
   if (!ExecutorsManager::IsKnownWindow(tab_window) ||
       window_utils::WindowHasNoThread(tab_window) ||
       !window_utils::IsWindowClass(tab_window, windows::kIeTabWindowClass)) {
     return false;
   }
   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) {
     LOG(WARNING) << "Failed to get an executor to get tab info.";
     return false;
   }
   tab_api::TabInfo tab_info;
   HRESULT hr = executor->GetTabInfo(&tab_info);
   if (FAILED(hr)) {
     LOG(WARNING) << "Executor failed to get tab info." << com::LogHr(hr);
     return false;
   }
   *is_protected_mode = !!tab_info.protected_mode;
   return true;
 }
 
 HRESULT CookieApiResult::GetCookieInfo(
     const std::string& url, const std::string& name, HWND window,
     bool is_protected_mode, CookieInfo* cookie_info) {
   // Get a tab window child of the cookie store window, so that we can properly
   // access session cookies.
   HWND tab_window = GetAnyTabInWindow(window, is_protected_mode);
   if (tab_window == NULL) {
     PostError("Failed to get tab window for a given cookie store.");
     return E_FAIL;
   }
 
   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) {
     LOG(WARNING) << "Failed to get an executor to get cookie info.";
     PostError("Internal Error while getting cookie info.");
     return E_FAIL;
   }
 
   HRESULT hr = executor->GetCookie(
       CComBSTR(url.data()), CComBSTR(name.data()), cookie_info);
@@ skipping 44 matching lines @@
     cookie_store->Set(keys::kTabIdsKey, protected_tab_ids.release());
     set_value(cookie_store.release());
     PostResult();
   }
   return true;
 }
 
 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) {
     LOG(WARNING) << "Failed to get an executor to register a cookie store.";
     PostError(api_module_constants::kInternalErrorError);
     return E_FAIL;
   }
   HRESULT hr = executor->RegisterCookieStore();
   if (FAILED(hr)) {
     // No DCHECK, this may happen if the window/thread dies on the way.
     LOG(ERROR) << "Can't register cookie store. " << com::LogHr(hr);
     PostError(api_module_constants::kInternalErrorError);
   }
   return hr;
 }
 
 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) {
     LOG(WARNING) << "Failed to get an executor to register a cookie store.";
     PostError(api_module_constants::kInternalErrorError);
     return E_FAIL;
   }
   HRESULT hr = executor->CookieStoreIsRegistered();
   if (FAILED(hr)) {
     // No DCHECK, this may happen if the window/thread dies on the way.
@@ skipping 312 matching lines @@
 CookieInfo::~CookieInfo() {
   // SysFreeString accepts NULL pointers.
   ::SysFreeString(name);
   ::SysFreeString(value);
   ::SysFreeString(domain);
   ::SysFreeString(path);
   ::SysFreeString(store_id);
 }
 
 }  // namespace cookie_api