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

chrome_frame/test/perf/silverlight.cc

Index: chrome_frame/test/perf/silverlight.cc
diff --git a/chrome_frame/test/perf/silverlight.cc b/chrome_frame/test/perf/silverlight.cc
index d5d95dffa321d18d74623a6611a40fb4665c4991..cd7a0a9411ba2f247a68b4329a0bf2719437b8e8 100644
--- a/chrome_frame/test/perf/silverlight.cc
+++ b/chrome_frame/test/perf/silverlight.cc
@@ -1,10 +1,12 @@
-// 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;
@@ -71,13 +73,13 @@ class IXcpControlHostImpl : public IXcpControlHost {
 
 // 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)
@@ -128,7 +130,7 @@ class SilverlightContainer :
     return hr;
   }
 
-  ScopedComPtr<IAxWinHostWindow> host_;
+  base::win::ScopedComPtr<IAxWinHostWindow> host_;
 };
 
 // Create and in-place Silverlight control. Should be extended to do something
@@ -156,7 +158,7 @@ TEST(ChromeFramePerf, DISABLED_HostSilverlight) {
       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();