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

ceee/ie/broker/cookie_api_module_unittest.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 unit tests.
 
 // MockWin32 can't be included after ChromeFrameHost because of an include
 // incompatibility with atlwin.h.
 #include "ceee/testing/utils/mock_win32.h"  // NOLINT
 
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
+#include "base/win/scoped_comptr.h"
 #include "ceee/common/process_utils_win.h"
 #include "ceee/ie/broker/api_dispatcher.h"
 #include "ceee/ie/broker/api_module_constants.h"
 #include "ceee/ie/broker/cookie_api_module.h"
 #include "ceee/ie/broker/tab_api_module.h"
 #include "ceee/ie/broker/window_api_module.h"
 #include "ceee/ie/testing/mock_broker_and_friends.h"
 #include "ceee/testing/utils/instance_count_mixin.h"
 #include "ceee/testing/utils/mock_window_utils.h"
 #include "ceee/testing/utils/test_utils.h"
@@ skipping 334 matching lines @@
   // Test failed executor access.
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_tab_window, _, NotNull())).
       WillOnce(SetArgumentPointee<2>(static_cast<void*>(NULL)));
   EXPECT_CALL(result, PostError(_)).Times(1);
   EXPECT_HRESULT_FAILED(result.CallGetCookieInfo("helloworld", "foo",
                                                  test_frame_window, false,
                                                  NULL));
   // Test executor.
   testing::MockCookieExecutor* mock_cookie_executor;
-  ScopedComPtr<ICeeeCookieExecutor> mock_cookie_executor_keeper;
+  base::win::ScopedComPtr<ICeeeCookieExecutor> mock_cookie_executor_keeper;
   EXPECT_HRESULT_SUCCEEDED(testing::MockCookieExecutor::CreateInitialized(
       &mock_cookie_executor, mock_cookie_executor_keeper.Receive()));
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_tab_window, _, NotNull())).
       WillRepeatedly(DoAll(SetArgumentPointee<2>(
                                mock_cookie_executor_keeper.get()),
                            AddRef(mock_cookie_executor_keeper.get())));
   // Failing Executor.
   // The executor classes are already strict from their base class impl.
   EXPECT_CALL(*mock_cookie_executor, GetCookie(_, _, _)).
@@ skipping 157 matching lines @@
   scoped_ptr<ListValue> tab_list;
 
   // Test failed executor access.
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_frame_window, _, NotNull())).
       WillOnce(SetArgumentPointee<2>(static_cast<void*>(NULL)));
   EXPECT_FALSE(result.CallGetTabListForWindow(test_frame_window, &tab_list));
 
   // Test executor.
   testing::MockWindowExecutor* mock_window_executor;
-  ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper;
+  base::win::ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper;
   EXPECT_HRESULT_SUCCEEDED(testing::MockWindowExecutor::CreateInitialized(
       &mock_window_executor, mock_window_executor_keeper.Receive()));
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_frame_window, _, NotNull())).
       WillRepeatedly(DoAll(SetArgumentPointee<2>(
                                mock_window_executor_keeper.get()),
                            AddRef(mock_window_executor_keeper.get())));
   // Failing Executor.
   // The executor classes are already strict from their base class impl.
   EXPECT_CALL(*mock_window_executor, GetTabs(NotNull())).
@@ skipping 90 matching lines @@
 
   // Test failed executor access.
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_window, _, NotNull())).
       WillOnce(SetArgumentPointee<2>(static_cast<void*>(NULL)));
   EXPECT_FALSE(result.CallGetTabProtectedMode(test_window,
                                               &is_protected_mode));
 
   // Test executor.
   testing::MockTabExecutor* mock_tab_executor;
-  ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper;
+  base::win::ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper;
   EXPECT_HRESULT_SUCCEEDED(testing::MockTabExecutor::CreateInitialized(
       &mock_tab_executor, mock_tab_executor_keeper.Receive()));
   EXPECT_CALL(result.mock_api_dispatcher_,
               GetExecutor(test_window, _, NotNull())).
       WillRepeatedly(DoAll(
           SetArgumentPointee<2>(mock_tab_executor_keeper.get()),
           AddRef(mock_tab_executor_keeper.get())));
   // Failing Executor.
   // The executor classes are already strict from their base class impl.
   EXPECT_CALL(*mock_tab_executor, GetTabInfo(NotNull())).
@@ skipping 355 matching lines @@
                       Return(true)));
   EXPECT_CALL(*cookie_changed.api_result_,
               CookieStoreIsRegistered(HWND(5))).WillOnce(Return(S_FALSE));
   EXPECT_CALL(*cookie_changed.api_result_,
               RegisterCookieStore(HWND(5))).WillOnce(Return(S_OK));
   EXPECT_EQ(true,
             cookie_changed.EventHandlerImpl(input_args, &converted_args));
 }
 
 }  // namespace