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

chrome_frame/com_message_event.h

-// Copyright (c) 2009 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_COM_MESSAGE_EVENT_H_
 #define CHROME_FRAME_COM_MESSAGE_EVENT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <mshtml.h>  // IHTMLEventObj
+
 #include "base/basictypes.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
 // Implements a MessageEvent compliant event object by providing MessageEvent
 // specific properties itself and inherited properties from a browser provided
 // event implementation.
 // NOTE: The messagePort and source properties will always be NULL.
 // See the HTML 5 spec for further details on a MessageEvent object:
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#messageevent
 class ComMessageEvent
     : public CComObjectRootEx<CComSingleThreadModel>,
       public IDispatch {
@@ skipping 33 matching lines @@
   // Initializes this object.  The container pointer is used to find the
   // container's IHTMLEventObj implementation if available.
   bool Initialize(IOleContainer* container, const std::string& message,
                   const std::string& origin, const std::string& event_type);
 
  protected:
   // HTML Event object to which we delegate property and method
   // calls that we do not directly support.  This may not be initialized
   // if our container does not require the properties/methods exposed by
   // the basic event object.
-  ScopedComPtr<IHTMLEventObj> basic_event_;
+  base::win::ScopedComPtr<IHTMLEventObj> basic_event_;
   std::string message_;
   std::string origin_;
   std::string type_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ComMessageEvent);
 };
 
 #endif  // CHROME_FRAME_COM_MESSAGE_EVENT_H_