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

chrome_frame/bind_context_info.cc

Index: chrome_frame/bind_context_info.cc
diff --git a/chrome_frame/bind_context_info.cc b/chrome_frame/bind_context_info.cc
index 89d6991a857f64bffd749075615c1498669b9984..bfdf89a20d73852e363f0879bf59c6e914b6adc9 100644
--- a/chrome_frame/bind_context_info.cc
+++ b/chrome_frame/bind_context_info.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -39,11 +39,11 @@ HRESULT BindContextInfo::FromBindContext(IBindCtx* bind_context,
     return E_POINTER;
   }
 
-  ScopedComPtr<IUnknown> context;
+  base::win::ScopedComPtr<IUnknown> context;
   HRESULT hr = bind_context->GetObjectParam(kBindContextInfo,
                                             context.Receive());
   if (context) {
-    ScopedComPtr<IBindContextInfoInternal> internal;
+    base::win::ScopedComPtr<IBindContextInfoInternal> internal;
     hr = internal.QueryFrom(context);
     if (SUCCEEDED(hr)) {
       hr = internal->GetCppObject(reinterpret_cast<void**>(info));