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

views/accessibility/view_accessibility.cc

 // 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.
 
 #include "views/accessibility/view_accessibility.h"
 
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/widget/widget.h"
 
 HRESULT ViewAccessibility::Initialize(views::View* view) {
@@ skipping 308 matching lines @@
   if (var_id.lVal == CHILDID_SELF) {
     view_->GetAccessibleDefaultAction(&temp_action);
   } else {
     if (!IsValidChild((var_id.lVal - 1), view_)) {
       return E_INVALIDARG;
     }
     view_->GetChildViewAt(var_id.lVal - 1)->
         GetAccessibleDefaultAction(&temp_action);
   }
   if (!temp_action.empty()) {
-    *def_action = CComBSTR(temp_action.c_str()).Detach();
+    *def_action = SysAllocString(temp_action.c_str());
   } else {
     return S_FALSE;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ViewAccessibility::get_accDescription(VARIANT var_id, BSTR* desc) {
   if (var_id.vt != VT_I4 || !desc) {
     return E_INVALIDARG;
   }
 
   std::wstring temp_desc;
 
   if (var_id.lVal == CHILDID_SELF) {
     view_->GetTooltipText(0, 0, &temp_desc);
   } else {
     if (!IsValidChild((var_id.lVal - 1), view_)) {
       return E_INVALIDARG;
     }
     view_->GetChildViewAt(var_id.lVal - 1)->GetTooltipText(0, 0, &temp_desc);
   }
   if (!temp_desc.empty()) {
-    *desc = CComBSTR(temp_desc.c_str()).Detach();
+    *desc = SysAllocString(temp_desc.c_str());
   } else {
     return S_FALSE;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ViewAccessibility::get_accFocus(VARIANT* focus_child) {
   if (!focus_child) {
     return E_INVALIDARG;
@@ skipping 42 matching lines @@
   if (var_id.lVal == CHILDID_SELF) {
     view_->GetAccessibleKeyboardShortcut(&temp_key);
   } else {
     if (!IsValidChild((var_id.lVal - 1), view_)) {
       return E_INVALIDARG;
     }
     view_->GetChildViewAt(var_id.lVal - 1)->
         GetAccessibleKeyboardShortcut(&temp_key);
   }
   if (!temp_key.empty()) {
-    *acc_key = CComBSTR(temp_key.c_str()).Detach();
+    *acc_key = SysAllocString(temp_key.c_str());
   } else {
     return S_FALSE;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ViewAccessibility::get_accName(VARIANT var_id, BSTR* name) {
   if (var_id.vt != VT_I4 || !name) {
     return E_INVALIDARG;
   }
 
   std::wstring temp_name;
 
   if (var_id.lVal == CHILDID_SELF) {
     // Retrieve the parent view's name.
     view_->GetAccessibleName(&temp_name);
   } else {
     if (!IsValidChild((var_id.lVal - 1), view_)) {
       return E_INVALIDARG;
     }
     // Retrieve the child view's name.
     view_->GetChildViewAt(var_id.lVal - 1)->GetAccessibleName(&temp_name);
   }
   if (!temp_name.empty()) {
     // Return name retrieved.
-    *name = CComBSTR(temp_name.c_str()).Detach();
+    *name = SysAllocString(temp_name.c_str());
   } else {
     // If view has no name, return S_FALSE.
     return S_FALSE;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ViewAccessibility::get_accParent(IDispatch** disp_parent) {
   if (!disp_parent) {
@@ skipping 247 matching lines @@
 
 STDMETHODIMP ViewAccessibility::put_accName(VARIANT var_id, BSTR put_name) {
   // Deprecated.
   return E_NOTIMPL;
 }
 
 STDMETHODIMP ViewAccessibility::put_accValue(VARIANT var_id, BSTR put_val) {
   // Deprecated.
   return E_NOTIMPL;
 }