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

chrome_frame/test/com_message_event_unittest.cc

-// 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.
 
 #include "chrome_frame/com_message_event.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 13 matching lines @@
     COM_INTERFACE_ENTRY(IOleContainer)
   END_COM_MAP()
 
   STDMETHOD(ParseDisplayName)(IBindCtx*, LPOLESTR, ULONG*, IMoniker**) {
     NOTREACHED();
     return E_NOTIMPL;
   }
   STDMETHOD(EnumObjects)(DWORD, IEnumUnknown**) {
     NOTREACHED();
     return E_NOTIMPL;
-  }  
+  }
   STDMETHOD(LockContainer)(BOOL) {
     NOTREACHED();
     return E_NOTIMPL;
   }
 };
 
 TEST(ComMessageEvent, WithDumbContainer) {
   CComObject<MockDumbContainer>* container_obj = NULL;
   CComObject<MockDumbContainer>::CreateInstance(&container_obj);
-  ScopedComPtr<IOleContainer> container(container_obj);
+  base::win::ScopedComPtr<IOleContainer> container(container_obj);
   EXPECT_FALSE(!container);
 
   CComObject<FriendlyComMessageEvent>* event_obj = NULL;
   CComObject<FriendlyComMessageEvent>::CreateInstance(&event_obj);
-  ScopedComPtr<IUnknown> event_ref(event_obj);
+  base::win::ScopedComPtr<IUnknown> event_ref(event_obj);
 
   bool result = event_obj->Initialize(container, "hi", "http://www.foo.com/",
                                       "message");
   EXPECT_TRUE(result);
   EXPECT_TRUE(!event_obj->basic_event());
 }
 
 // Mock object to mimic a "smart" container, e.g. IE, that will
 // be able to return an IHTMLDocument2 and 4, and from which you
 // can get an IHTMLEventObj implementation.  Doubles as a mock
@@ skipping 211 matching lines @@
   STDMETHODNOTIMP(get_offsetY, (long*));
   STDMETHODNOTIMP(get_screenX, (long*));
   STDMETHODNOTIMP(get_screenY, (long*));
   STDMETHODNOTIMP(get_srcFilter, (IDispatch**));
 #undef STDMETHODNOTIMP
 };
 
 TEST(ComMessageEvent, WithSmartContainer) {
   CComObject<MockSmartContainer>* container_obj = NULL;
   CComObject<MockSmartContainer>::CreateInstance(&container_obj);
-  ScopedComPtr<IOleContainer> container(container_obj);
+  base::win::ScopedComPtr<IOleContainer> container(container_obj);
   EXPECT_FALSE(!container);
 
   CComObject<FriendlyComMessageEvent>* event_obj = NULL;
   CComObject<FriendlyComMessageEvent>::CreateInstance(&event_obj);
-  ScopedComPtr<IUnknown> event_ref(event_obj);
+  base::win::ScopedComPtr<IUnknown> event_ref(event_obj);
 
-  bool succeeded = event_obj->Initialize(container, "hi", 
+  bool succeeded = event_obj->Initialize(container, "hi",
                                          "http://www.foo.com/", "message");
   EXPECT_TRUE(succeeded);
   EXPECT_FALSE(!event_obj->basic_event());
 
   // Name handled natively by CF's ComMessageEvent.
   DISPID dispid = -1;
   LPOLESTR name = L"data";
   HRESULT hr = event_obj->GetIDsOfNames(IID_IDispatch, &name, 1,
                                         LOCALE_USER_DEFAULT, &dispid);
   EXPECT_HRESULT_SUCCEEDED(hr);
@@ skipping 16 matching lines @@
   EXPECT_EQ(result.vt, VT_BSTR);
   EXPECT_EQ(wcscmp(result.bstrVal, L"hi"), 0);
 
   // And now check passthrough.
   result.Clear();
   hr = dispatcher.GetProperty(MockSmartContainer::kDispId, &result);
   EXPECT_HRESULT_SUCCEEDED(hr);
   EXPECT_EQ(result.vt, VT_I4);
   EXPECT_EQ(result.lVal, MockSmartContainer::kResultValue);
 }