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

chrome_frame/test/perf/silverlight.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 <atlbase.h>
 #include <atlwin.h>
 #include <atlhost.h>
-#include "base/scoped_comptr_win.h"
+
+#include "base/win/scoped_comptr.h"
 #include "chrome_frame/test/perf/chrome_frame_perftest.h"
 
 interface IXcpControlDownloadCallback;
 interface __declspec(uuid("1B36028E-B491-4bb2-8584-8A9E0A677D6E"))
 IXcpControlHost : public IUnknown {
   typedef enum {
     XcpHostOption_FreezeOnInitialFrame       = 0x001,
     XcpHostOption_DisableFullScreen          = 0x002,
     XcpHostOption_DisableManagedExecution    = 0x008,
     XcpHostOption_EnableCrossDomainDownloads = 0x010,
@@ skipping 46 matching lines @@
   }
 
   STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback,
                          IStream** ppStream) {
     return E_NOTIMPL;
   }
 };
 
 // Silverlight container. Supports do-nothing implementation of IXcpControlHost.
 // Should be extended to do some real movie-or-something download.
-class SilverlightContainer :
-    public IServiceProviderImpl<SilverlightContainer>,
-    public IXcpControlHostImpl,
-    public CWindowImpl<SilverlightContainer, CWindow, CWinTraits<
-        WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
-        WS_EX_APPWINDOW | WS_EX_WINDOWEDGE> >,
-    public CComObjectRootEx<CComSingleThreadModel> {
+class SilverlightContainer : public IServiceProviderImpl<SilverlightContainer>,

[brettw, 2011/04/12 19:53:49]

I think the old indenting was better here.

[tfarina, 2011/04/12 20:06:51]

Reverted this change. Lint just complained, so I tried to fix. But I agree the
old indentation is better.

+                             public IXcpControlHostImpl,
+                             public CWindowImpl<
+        SilverlightContainer, CWindow, CWinTraits<
+            WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN |
+            WS_CLIPSIBLINGS, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE> >,
+                             public CComObjectRootEx<CComSingleThreadModel> {
  public:
   DECLARE_WND_CLASS_EX(L"Silverlight_container", 0, 0)
   BEGIN_COM_MAP(SilverlightContainer)
     COM_INTERFACE_ENTRY(IServiceProvider)
     COM_INTERFACE_ENTRY(IXcpControlHost)
   END_COM_MAP()
 
   BEGIN_SERVICE_MAP(SilverlightContainer)
     SERVICE_ENTRY(__uuidof(IXcpControlHost))
   END_SERVICE_MAP()
@@ skipping 30 matching lines @@
     }
     return hr;
   }
 
   HRESULT CreateControl() {
     HRESULT hr = host_->CreateControl(L"AgControl.AgControl", m_hWnd, NULL);
     EXPECT_HRESULT_SUCCEEDED(hr);
     return hr;
   }
 
-  ScopedComPtr<IAxWinHostWindow> host_;
+  base::win::ScopedComPtr<IAxWinHostWindow> host_;
 };
 
 // Create and in-place Silverlight control. Should be extended to do something
 // more meaningful.
 TEST(ChromeFramePerf, DISABLED_HostSilverlight2) {
   SimpleModule module;
   AtlAxWinInit();
   CComObjectStackEx<SilverlightContainer> wnd;
   RECT rc = {0, 0, 800, 600};
   wnd.CreateWndAndHost(&rc);
   PerfTimeLogger perf_create("Create Silverlight Control2");
   wnd.CreateControl();
   perf_create.Done();
   wnd.DestroyWindow();
 }
 
 // Simplest test - creates in-place Silverlight control.
 TEST(ChromeFramePerf, DISABLED_HostSilverlight) {
   SimpleModule module;
   AtlAxWinInit();
   CAxWindow host;
   RECT rc = {0, 0, 800, 600};
   PerfTimeLogger perf_create("Create Silverlight Control");
   host.Create(NULL, rc, L"AgControl.AgControl",
       WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
       WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
   EXPECT_TRUE(host.m_hWnd != NULL);
-  ScopedComPtr<IDispatch> disp;
+  base::win::ScopedComPtr<IDispatch> disp;
   HRESULT hr = host.QueryControl(disp.Receive());
   EXPECT_HRESULT_SUCCEEDED(hr);
   disp.Release();
   perf_create.Done();
 }