Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome_frame/test/mock_ie_event_sink_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
 
 #include <sstream>
 
+#include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
-#include "base/utf_string_conversions.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 
 // Needed for CreateFunctor.
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
 
 using testing::_;
 using testing::Cardinality;
 using testing::Exactly;
 using testing::ExpectationSet;
@@ skipping 129 matching lines @@
 void MockIEEventSink::ExpectAnyNavigations() {
   EXPECT_CALL(*this, OnBeforeNavigate2(_, _, _, _, _, _, _))
       .Times(testing::AnyNumber());
   EXPECT_CALL(*this, OnFileDownload(VARIANT_TRUE, _))
       .Times(testing::AnyNumber());
   EXPECT_CALL(*this, OnNavigateComplete2(_, _))
       .Times(testing::AnyNumber());
 }
 
 void MockIEEventSink::ExpectDocumentReadystate(int ready_state) {
-  ScopedComPtr<IWebBrowser2> browser(event_sink_->web_browser2());
+  base::win::ScopedComPtr<IWebBrowser2> browser(event_sink_->web_browser2());
   EXPECT_TRUE(browser != NULL);
   if (browser) {
-    ScopedComPtr<IDispatch> document;
+    base::win::ScopedComPtr<IDispatch> document;
     browser->get_Document(document.Receive());
     EXPECT_TRUE(document != NULL);
     if (document) {
       DISPPARAMS params = { 0 };
       base::win::ScopedVariant result;
       EXPECT_HRESULT_SUCCEEDED(document->Invoke(DISPID_READYSTATE, IID_NULL,
           LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params,
           result.Receive(), NULL, NULL));
       EXPECT_EQ(VT_I4, result.type());
       if (result.type() == VT_I4) {
@@ skipping 46 matching lines @@
     const std::wstring& relative_path) {
   return server_mock_.root_dir().Append(relative_path);
 }
 
 std::wstring MockIEEventSinkTest::GetTestUrl(
     const std::wstring& relative_path) {
   return server_mock_.Resolve(relative_path.c_str());
 }
 
 }  // namespace chrome_frame_test