Use Scoped[Bstr,ComPtr,Variant] instead of their ATL equivalents to reduce de...

views/accessibility/view_accessibility_wrapper.h

 // Copyright (c) 2006-2008 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 VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
 #define VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_
 
 #include <atlcomcli.h>
 #include <oleacc.h>
 
 #include "base/basictypes.h"
+#include "base/scoped_comptr_win.h"
 
 namespace views {
 class View;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ViewAccessibilityWrapper
 //
 // Wrapper class for returning a pointer to the appropriate (platform-specific)
@@ skipping 15 matching lines @@
   // retrieve MSAA implementation for child or parent, when navigating MSAA
   // hierarchy.
   STDMETHODIMP GetInstance(REFIID iid, void** interface_ptr);
 
   // Sets the accessibility interface implementation of this wrapper to be
   // anything the user specifies.
   STDMETHODIMP SetInstance(IAccessible* interface_ptr);
 
  private:
   // Instance of accessibility information and handling for a View.
-  CComPtr<IAccessible> accessibility_info_;
+  ScopedComPtr<IAccessible> accessibility_info_;
 
   // View needed to initialize IAccessible.
   views::View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewAccessibilityWrapper);
 };
 
 #endif  // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_WRAPPER_H_