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

chrome_frame/test/mock_ie_event_sink_test.h

-// 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.
 
 #ifndef CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_TEST_H_
 #define CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_TEST_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <string>
 #include <vector>
@@ skipping 184 matching lines @@
       DCHECK_NE(cookie_, 0UL);
       AtlUnadvise(event_source_, IID_IPropertyNotifySink, cookie_);
       event_source_.Release();
       cookie_ = 0;
     }
   }
 
  private:
   CComObject<PropertyNotifySinkImpl>* sink_;
   DWORD cookie_;
-  ScopedComPtr<IUnknown> event_source_;
+  base::win::ScopedComPtr<IUnknown> event_source_;
 };
 
 // Allows tests to observe when processes exit.
 class MockObjectWatcherDelegate : public base::win::ObjectWatcher::Delegate {
  public:
   // base::win::ObjectWatcher::Delegate implementation
   MOCK_METHOD1(OnObjectSignaled, void (HANDLE process_handle));  // NOLINT
 
   virtual ~MockObjectWatcherDelegate() {
     // Would be nice to free them when OnObjectSignaled is called, too, but
@@ skipping 115 matching lines @@
   testing::StrictMock<MockIEEventSink> ie_mock_;
   testing::StrictMock<MockWebServer> server_mock_;
   scoped_refptr<HungCOMCallDetector> hung_call_detector_;
  private:
   DISALLOW_COPY_AND_ASSIGN(MockIEEventSinkTest);
 };
 
 }  // namespace chrome_frame_test
 
 #endif  // CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_TEST_H_