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

chrome_frame/bind_context_info.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 "chrome_frame/bind_context_info.h"
 #include "chrome_frame/utils.h"
 
 // This is non const due to API expectations
 static wchar_t* kBindContextInfo = L"_CHROMEFRAME_BIND_CONTEXT_INFO_";
 
 // BindContextInfo member definitions.
@@ skipping 20 matching lines @@
 }
 
 HRESULT BindContextInfo::FromBindContext(IBindCtx* bind_context,
                                          BindContextInfo** info) {
   DCHECK(info);
   if (!bind_context) {
     NOTREACHED();
     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));
       DCHECK_EQ(hr, S_OK);
       DLOG_IF(ERROR, *info != static_cast<BindContextInfo*>(internal.get()))
           << "marshalling took place!";
     }
   } else {
     DCHECK(FAILED(hr));
     CComObject<BindContextInfo>* bind_context_info = NULL;
@@ skipping 21 matching lines @@
   }
 }
 
 std::wstring BindContextInfo::GetUrl() {
   if (has_prot_data()) {
     return prot_data_->url();
   }
   return std::wstring();
 }