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

ceee/ie/broker/tab_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.
 //
 // Tab 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/json/json_writer.h"
 #include "base/json/json_reader.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "ceee/common/initializing_coclass.h"
 #include "ceee/ie/broker/api_dispatcher.h"
 #include "ceee/ie/broker/chrome_postman.h"
 #include "ceee/ie/broker/tab_api_module.h"
 #include "ceee/ie/common/ie_util.h"
 #include "ceee/ie/testing/mock_broker_and_friends.h"
 #include "ceee/testing/utils/instance_count_mixin.h"
 #include "ceee/testing/utils/mock_com.h"
 #include "ceee/testing/utils/mock_window_utils.h"
@@ skipping 158 matching lines @@
  private:
   class MockChromePostman : public ChromePostman {
    public:
     MOCK_METHOD2(PostMessage, void(BSTR, BSTR));
   };
   // We should never get to the postman, we mock all the calls getting there.
   // So we simply instantiate it strict and it will register itself as the
   // one and only singleton to use all the time.
   CComObjectStackEx< StrictMock< MockChromePostman > > postman_;
   // To control the life span of the tab executor.
-  ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper_;
-  ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper_;
+  base::win::ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper_;
+  base::win::ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper_;
 };
 
 TEST_F(TabApiTests, CreateTabValueErrorHandling) {
   testing::LogDisabler no_dchecks;
 
   // Window with no thread.
   StrictMock<testing::MockWindowUtils> window_utils;
   EXPECT_CALL(window_utils, WindowHasNoThread(kGoodTabWindow)).
       WillOnce(Return(true));
 
@@ skipping 559 matching lines @@
   invocation.Execute(ListValue(), kRequestId);
 
   invocation.AllocateNewResult(kRequestId);
   EXPECT_CALL(*invocation.invocation_result_,
               GetSpecifiedOrCurrentFrameWindow(_, _)).
       WillRepeatedly(Return(kGoodFrameWindow));
 
   // Failing Executor.
   // The executor classes are already strict from their base class impl.
   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(invocation.mock_api_dispatcher_,
               GetExecutor(kGoodFrameWindow, _, NotNull())).
       WillRepeatedly(DoAll(SetArgumentPointee<2>(
                                mock_window_executor_keeper_.get()),
                            AddRef(mock_window_executor_keeper_.get())));
   EXPECT_CALL(*mock_window_executor, GetTabs(NotNull())).
       WillOnce(Return(E_FAIL));
   EXPECT_CALL(*invocation.invocation_result_, PostError(_)).Times(1);
@@ skipping 330 matching lines @@
 
   // Navigate Fails.
   invocation.AllocateNewResult(kRequestId);
   EXPECT_CALL(*invocation.invocation_result_,
               GetSpecifiedOrCurrentFrameWindow(_, _)).
       WillOnce(Return(kGoodFrameWindow));
   CComObject<StrictMock<testing::MockIWebBrowser2>>* browser;
   CComObject<StrictMock<testing::MockIWebBrowser2>>::CreateInstance(
       &browser);
   DCHECK(browser != NULL);
-  ScopedComPtr<IWebBrowser2> browser_keeper(browser);
+  base::win::ScopedComPtr<IWebBrowser2> browser_keeper(browser);
   if (pre_vista) {
     EXPECT_CALL(mock_ie_util, GetWebBrowserForTopLevelIeHwnd(
         kGoodFrameWindow, _, NotNull())).WillRepeatedly(DoAll(
             CopyInterfaceToArgument<2>(browser_keeper.get()), Return(S_OK)));
     EXPECT_CALL(*browser, Navigate(_, _, _, _, _)).WillOnce(Return(E_FAIL));
   } else {
     AlwaysMockGetTabExecutor(&invocation.mock_api_dispatcher_, kGoodTabWindow);
     EXPECT_CALL(*mock_tab_executor_, Navigate(_, _, _)).
         WillOnce(Return(E_FAIL));
   }
@@ skipping 421 matching lines @@
   EXPECT_EQ(TabApiResult::IsTabFromSameOrUnspecifiedFrameWindow(
       input_dict, &other_saved_window, NULL, &mock_api_dispatcher), S_FALSE);
   tab_window = NULL;
   EXPECT_EQ(TabApiResult::IsTabFromSameOrUnspecifiedFrameWindow(
       input_dict, &other_saved_window, &tab_window, &mock_api_dispatcher),
           S_FALSE);
   EXPECT_EQ(kGoodTabWindow, tab_window);
 }
 
 }  // namespace