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

chrome_frame/test/navigation_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 <string>
 
-#include "base/scoped_comptr_win.h"
 #include "base/test/test_file_util.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/chrome_frame_ui_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
 #include "net/http/http_util.h"
 
 // Needed for CreateFunctor.
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
@@ skipping 251 matching lines @@
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(3))))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(GetAnchorPageUrl(0));
 }
 
 // Test that a user cannot navigate to a restricted site and that the security
 // dialog appears.
 TEST_P(FullTabNavigationTest, RestrictedSite) {
   // Add the server to restricted sites zone.
-  ScopedComPtr<IInternetSecurityManager> security_manager;
+  base::win::ScopedComPtr<IInternetSecurityManager> security_manager;
   HRESULT hr = security_manager.CreateInstance(CLSID_InternetSecurityManager);
   ASSERT_HRESULT_SUCCEEDED(hr);
   hr = security_manager->SetZoneMapping(URLZONE_UNTRUSTED,
       GetTestUrl(L"").c_str(), SZM_CREATE);
 
   EXPECT_CALL(ie_mock_, OnFileDownload(_, _)).Times(testing::AnyNumber());
   server_mock_.ExpectAndServeAnyRequests(GetParam());
 
   MockWindowObserver win_observer_mock;
 
@@ skipping 972 matching lines @@
           &no_referrer_target_opener_window_mock));
 
   EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIENavigateAndLoop(initial_url,
                           kChromeFrameLongNavigationTimeoutInSeconds);
 }
 
 }  // namespace chrome_frame_test