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

ceee/ie/broker/window_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.
 //
 // Window 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 <iepmapi.h>
 #include <set>
 
-#include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
+#include "base/win/scoped_comptr.h"
 #include "ceee/common/process_utils_win.h"
 #include "ceee/ie/broker/chrome_postman.h"
 #include "ceee/ie/broker/window_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"
 #include "ceee/testing/utils/test_utils.h"
 #include "chrome/browser/extensions/extension_event_names.h"
@@ skipping 242 matching lines @@
     EXPECT_CALL(user32_, IsWindow(NotNull())).WillRepeatedly(Return(TRUE));
     EXPECT_CALL(user32_, GetClassName(NotNull(), NotNull(), Gt(0))).
         WillRepeatedly(DoAll(CopyStringToArgument<1>(kClassName),
                              Return(arraysize(kClassName))));
   }
   StrictMock<testing::MockUser32> user32_;
   // The executor classes are already strict from their base class impl.
   testing::MockWindowExecutor* mock_window_executor_;
   testing::MockTabExecutor* mock_tab_executor_;
   // To control the life span of the executors.
-  ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper_;
-  ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper_;
+  base::win::ScopedComPtr<ICeeeWindowExecutor> mock_window_executor_keeper_;
+  base::win::ScopedComPtr<ICeeeTabExecutor> mock_tab_executor_keeper_;
 
   // Lifespan controlled by Singleton template.
   StrictMock<testing::MockExecutorsManager>* executors_manager_;
  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
@@ skipping 441 matching lines @@
   EXPECT_CALL(mock_ie_create, IEIsProtectedModeURL(_)).
       WillRepeatedly(Return(S_FALSE));
   EXPECT_CALL(mock_ie_create, CoCreateInstance(_, _, _, _, _)).
       WillOnce(Return(REGDB_E_CLASSNOTREG));
   invocation.Execute(args_list, kRequestId);
 
   invocation.AllocateNewResult(kRequestId);
   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);
   EXPECT_CALL(mock_ie_create, CoCreateInstance(_, _, _, _, _)).
       WillRepeatedly(DoAll(SetArgumentPointee<4>(browser_keeper.get()),
                      AddRef(browser_keeper.get()), Return(S_OK)));
 
   EXPECT_CALL(*browser, get_HWND(NotNull())).WillRepeatedly(DoAll(
       SetArgumentPointee<0>(0), Return(S_OK)));
   EXPECT_CALL(*invocation.invocation_result_, UpdateWindowRect(_, _)).
       WillOnce(Return(false));
   invocation.Execute(args_list, kRequestId);
 
@@ skipping 44 matching lines @@
     { &args3, about_blank, false },
     { &empty_args, about_blank, false },
   };
 
   typedef StrictMock<MockWindowInvocation<window_api::CreateWindowFunc>>
       MockCreateWindowFunc;
 
   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);
   MockIeWindowCreation mock_ie_create;
   // TODO(mad@chromium.org): Test behavior with protected on too.
   EXPECT_CALL(mock_ie_create, IEIsProtectedModeURL(_)).
       WillRepeatedly(Return(S_FALSE));
   EXPECT_CALL(mock_ie_create, CoCreateInstance(_, _, _, _, _)).
       WillRepeatedly(DoAll(SetArgumentPointee<4>(browser_keeper.get()),
                      AddRef(browser_keeper.get()), Return(S_OK)));
   EXPECT_CALL(*browser, get_HWND(NotNull())).WillRepeatedly(DoAll(
       SetArgumentPointee<0>(0), Return(S_OK)));
   EXPECT_CALL(*browser, Navigate(_, _, _, _, _)).WillRepeatedly(Return(S_OK));
@@ skipping 219 matching lines @@
                 kWindow2, values[i].populate)).WillOnce(Return(true));
     EXPECT_CALL(*invocation.invocation_result_, CallRealPostResult()).Times(1);
     MockIterativeWindowApiResult::ResetCounters();
     invocation.Execute(*values[i].value, kRequestId);
     EXPECT_EQ(MockIterativeWindowApiResult::error_counter(), 0);
     EXPECT_EQ(MockIterativeWindowApiResult::success_counter(), ie_hwnds.size());
   }
 }
 
 }  // namespace