Remove wstring from views. Part 3: Switch accessibility strings to string16....

chrome/browser/ui/views/infobars/infobar_container.cc

 // 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 "chrome/browser/ui/views/infobars/infobar_container.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/infobars/infobars.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "grit/generated_resources.h"
 
 // InfoBarContainer, public: ---------------------------------------------------
 
 InfoBarContainer::InfoBarContainer(Delegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL) {
   SetID(VIEW_ID_INFO_BAR_CONTAINER);
   SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER)));
+      l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER));
 }
 
 InfoBarContainer::~InfoBarContainer() {
   // We NULL this pointer before resetting the TabContents to prevent view
   // hierarchy modifications from attempting to resize the delegate which
   // could be in the process of shutting down.
   delegate_ = NULL;
   ChangeTabContents(NULL);
 }
 
@@ skipping 123 matching lines @@
       break;
     }
   }
 }
 
 void InfoBarContainer::ReplaceInfoBar(InfoBarDelegate* old_delegate,
                                       InfoBarDelegate* new_delegate) {
   RemoveInfoBar(old_delegate, false);  // no animation
   AddInfoBar(new_delegate, false);  // no animation
 }