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

chrome_frame/com_message_event.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/com_message_event.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 
 ComMessageEvent::ComMessageEvent() {
 }
 
 ComMessageEvent::~ComMessageEvent() {
 }
 
 bool ComMessageEvent::Initialize(IOleContainer* container,
                                  const std::string& message,
                                  const std::string& origin,
                                  const std::string& event_type) {
   DLOG_IF(WARNING, !container) << __FUNCTION__ << " no container";
   message_ = message;
   origin_ = origin;
   type_ = event_type;
 
   // May remain NULL if container not IE
-  ScopedComPtr<IHTMLEventObj> basic_event;
-  ScopedComPtr<IHTMLDocument2> doc;
+  base::win::ScopedComPtr<IHTMLEventObj> basic_event;
+  base::win::ScopedComPtr<IHTMLDocument2> doc;
 
   // Fetching doc may fail in non-IE containers
   // and container might be NULL in some applications.
   if (container)
     container->QueryInterface(doc.Receive());
   if (doc) {
-    ScopedComPtr<IHTMLDocument4> doc4;
+    base::win::ScopedComPtr<IHTMLDocument4> doc4;
     doc4.QueryFrom(doc);
     DCHECK(doc4);  // supported by IE5.5 and higher
     if (doc4) {
       // IHTMLEventObj5 is only supported in IE8 and later, so we provide our
       // own (minimalistic) implementation of it.
       doc4->createEventObject(NULL, basic_event.Receive());
       DCHECK(basic_event);
     }
   }
 
@@ skipping 105 matching lines @@
   HRESULT hr;
   if (flags & DISPATCH_PROPERTYGET) {
     result->vt = VT_BSTR;
     result->bstrVal = ::SysAllocString(value);
     hr = S_OK;
   } else {
     hr = DISP_E_TYPEMISMATCH;
   }
   return hr;
 }