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

net/http/url_security_manager_win.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 "net/http/url_security_manager.h"
 
 #include <urlmon.h>
 #pragma comment(lib, "urlmon.lib")
 
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/scoped_comptr.h"
 #include "googleurl/src/gurl.h"
 #include "net/http/http_auth_filter.h"
 
 // The Windows implementation of URLSecurityManager uses WinINet/IE's
 // URL security zone manager.  See the MSDN page "URL Security Zones" at
 // http://msdn.microsoft.com/en-us/library/ms537021(VS.85).aspx for more
 // info on the Internet Security Manager and Internet Zone Manager objects.
 //
 // On Windows, we honor the WinINet/IE settings and group policy related to
 // URL Security Zones.  See the Microsoft Knowledge Base article 182569
 // "Internet Explorer security zones registry entries for advanced users"
 // (http://support.microsoft.com/kb/182569) for more info on these registry
 // keys.
 
 namespace net {
 
 class URLSecurityManagerWin : public URLSecurityManager {
  public:
   explicit URLSecurityManagerWin(const HttpAuthFilter* whitelist_delegate);
 
   // URLSecurityManager methods:
   virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const;
   virtual bool CanDelegate(const GURL& auth_origin) const;
 
  private:
   bool EnsureSystemSecurityManager();
 
-  ScopedComPtr<IInternetSecurityManager> security_manager_;
+  base::win::ScopedComPtr<IInternetSecurityManager> security_manager_;
   scoped_ptr<const HttpAuthFilter> whitelist_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(URLSecurityManagerWin);
 };
 
 URLSecurityManagerWin::URLSecurityManagerWin(
     const HttpAuthFilter* whitelist_delegate)
     : whitelist_delegate_(whitelist_delegate) {
 }
 
@@ skipping 77 matching lines @@
     const HttpAuthFilter* whitelist_default,
     const HttpAuthFilter* whitelist_delegate) {
   // If we have a whitelist, just use that.
   if (whitelist_default)
     return new URLSecurityManagerWhitelist(whitelist_default,
                                            whitelist_delegate);
   return new URLSecurityManagerWin(whitelist_delegate);
 }
 
 }  //  namespace net