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

chrome_frame/test/ie_event_sink.h

 // 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_TEST_IE_EVENT_SINK_H_
 #define CHROME_FRAME_TEST_IE_EVENT_SINK_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <exdispid.h>
 #include <string>
 
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
+#include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
-#include "chrome_frame/test/simulate_input.h"
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 namespace chrome_frame_test {
 
 // Listener for all events from the IEEventSink, defined below. This includes
 // IE and CF events. Unfortunately some of these events are unreliable or have
 // strange behavior across different platforms/browsers. See notes besides
 // each method.
@@ skipping 199 matching lines @@
     return DispEventsImpl::Invoke(dispid, riid, lcid, flags, params, result,
                                   except_info, arg_error);
   }
 #endif  // _DEBUG
 
   // IChromeFrame callbacks
   HRESULT OnLoad(const VARIANT* param);
   HRESULT OnLoadError(const VARIANT* param);
   HRESULT OnMessage(const VARIANT* param);
 
-  ScopedComPtr<IWebBrowser2> web_browser2_;
-  ScopedComPtr<IChromeFrame> chrome_frame_;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2_;
+  base::win::ScopedComPtr<IChromeFrame> chrome_frame_;
   DispCallback<IEEventSink> onmessage_;
   DispCallback<IEEventSink> onloaderror_;
   DispCallback<IEEventSink> onload_;
   IEEventListener* listener_;
   base::ProcessId ie_process_id_;
   bool did_receive_on_quit_;
   static bool abnormal_shutdown_;
 
   static _ATL_FUNC_INFO kBeforeNavigate2Info;
   static _ATL_FUNC_INFO kNavigateComplete2Info;
@@ skipping 33 matching lines @@
     listener_ = listener;
   }
 
  protected:
   PropertyNotifySinkListener* listener_;
 };
 
 }  // namespace chrome_frame_test
 
 #endif  // CHROME_FRAME_TEST_IE_EVENT_SINK_H_