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

chrome_frame/bind_context_info.h

-// 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.
 
 #ifndef CHROME_FRAME_BIND_CONTEXT_INFO_H_
 #define CHROME_FRAME_BIND_CONTEXT_INFO_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "base/win/scoped_comptr.h"
@@ skipping 16 matching lines @@
   ~BindContextInfo();
 
   BEGIN_COM_MAP(BindContextInfo)
     COM_INTERFACE_ENTRY(IBindContextInfoInternal)
     COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, ftm_)
   END_COM_MAP()
 
   // Returns the BindContextInfo instance associated with the bind
   // context. Creates it if needed.
   // The returned info object will be AddRef-ed on return, so use
-  // ScopedComPtr<>::Receive() to receive this pointer.
+  // base::win::ScopedComPtr<>::Receive() to receive this pointer.
   static HRESULT FromBindContext(IBindCtx* bind_context,
                                  BindContextInfo** info);
 
   void set_chrome_request(bool chrome_request) {
     chrome_request_ = chrome_request;
   }
 
   bool chrome_request() const {
     return chrome_request_;
   }
@@ skipping 50 matching lines @@
 
   HRESULT Initialize(IBindCtx* bind_ctx);
 
  private:
   base::win::ScopedComPtr<IStream> cache_;
   bool no_cache_;
   bool chrome_request_;
   bool is_switching_;
   base::win::ScopedComPtr<IUnknown> ftm_;
   scoped_refptr<ProtData> prot_data_;
-  ScopedComPtr<IInternetProtocol> protocol_;
+  base::win::ScopedComPtr<IInternetProtocol> protocol_;
 
   DISALLOW_COPY_AND_ASSIGN(BindContextInfo);
 };
 
 #endif  // CHROME_FRAME_BIND_CONTEXT_INFO_H_