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

chrome_frame/test/navigation_test.cc

Index: chrome_frame/test/navigation_test.cc
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index 3dfa0ba540ca7f46e4cba3c2c0e9c8ec7459c78c..82385a591e8c77032fb3cec1de0d5c769c3b46bb 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -1,11 +1,11 @@
-// 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"
@@ -277,7 +277,7 @@ TEST_P(FullTabNavigationTest, BackForwardAnchor) {
 // 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,