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

chrome/browser/browser_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 "chrome/browser/browser_accessibility.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_accessibility_manager.h"
 
 using webkit_glue::WebAccessibility;
@@ skipping 236 matching lines @@
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_DEFAULTACTION,
                                 var_id, NULL, NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code) {
     // No string found.
     return S_FALSE;
   }
 
-  *def_action = CComBSTR(response().output_string.c_str()).Detach();
+  *def_action = SysAllocString(response().output_string.c_str());
 
   DCHECK(*def_action);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accDescription(VARIANT var_id,
                                                       BSTR* desc) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
 
   if (var_id.vt != VT_I4 || !desc)
     return E_INVALIDARG;
 
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_DESCRIPTION, var_id,
                                 NULL, NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code) {
     // No string found.
     return S_FALSE;
   }
 
-  *desc = CComBSTR(response().output_string.c_str()).Detach();
+  *desc = SysAllocString(response().output_string.c_str());
 
   DCHECK(*desc);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accFocus(VARIANT* focus_child) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
@@ skipping 41 matching lines @@
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_HELPTEXT, var_id,
                                 NULL, NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code || response().output_string.empty()) {
     // No string found.
     return S_FALSE;
   }
 
-  *help = CComBSTR(response().output_string.c_str()).Detach();
+  *help = SysAllocString(response().output_string.c_str());
 
   DCHECK(*help);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accKeyboardShortcut(VARIANT var_id,
                                                            BSTR* acc_key) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
 
   if (var_id.vt != VT_I4 || !acc_key)
     return E_INVALIDARG;
 
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_KEYBOARDSHORTCUT,
                                 var_id, NULL, NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code) {
     // No string found.
     return S_FALSE;
   }
 
-  *acc_key = CComBSTR(response().output_string.c_str()).Detach();
+  *acc_key = SysAllocString(response().output_string.c_str());
 
   DCHECK(*acc_key);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accName(VARIANT var_id, BSTR* name) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
 
   if (var_id.vt != VT_I4 || !name)
     return E_INVALIDARG;
 
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_NAME, var_id, NULL,
                                 NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code) {
     // No string found.
     return S_FALSE;
   }
 
-  *name = CComBSTR(response().output_string.c_str()).Detach();
+  *name = SysAllocString(response().output_string.c_str());
 
   DCHECK(*name);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accParent(IDispatch** disp_parent) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
@@ skipping 90 matching lines @@
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_VALUE, var_id, NULL,
                                 NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code || response().output_string.empty()) {
     // No string found.
     return S_FALSE;
   }
 
-  *value = CComBSTR(response().output_string.c_str()).Detach();
+  *value = SysAllocString(response().output_string.c_str());
 
   DCHECK(*value);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibility::get_accHelpTopic(BSTR* help_file,
                                                     VARIANT var_id,
                                                     LONG* topic_id) {
   if (help_file)
     *help_file = NULL;
@@ skipping 148 matching lines @@
     state |= STATE_SYSTEM_READONLY;
 
   if ((browser_accessibility_state >> WebAccessibility::STATE_TRAVERSED) & 1)
     state |= STATE_SYSTEM_TRAVERSED;
 
   if ((browser_accessibility_state >> WebAccessibility::STATE_UNAVAILABLE) & 1)
     state |= STATE_SYSTEM_UNAVAILABLE;
 
   return state;
 }