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

chrome/browser/ui/views/download_item_view.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/download_item_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 1043 matching lines @@
   SetEnabled(true);  // Triggers a repaint.
 }
 
 bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
   if (x > drop_down_x_left_ && x < drop_down_x_right_)
     return true;
   return false;
 }
 
 void DownloadItemView::UpdateAccessibleName() {
-  std::wstring current_name;
+  string16 current_name;
   GetAccessibleName(&current_name);
 
-  std::wstring new_name;
+  string16 new_name;
   if (download_->safety_state() == DownloadItem::DANGEROUS) {
-    new_name = dangerous_download_label_->GetText();
+    new_name = WideToUTF16Hack(dangerous_download_label_->GetText());
   } else {
-    new_name = status_text_ + L" " +
-        download_->GetFileNameToReportUser().ToWStringHack();
+    new_name = WideToUTF16Hack(status_text_) + char16(' ') +
+        WideToUTF16Hack(download_->GetFileNameToReportUser().ToWStringHack());
   }
 
   // If the name has changed, call SetAccessibleName and notify
   // assistive technology that the name has changed so they can
   // announce it immediately.
   if (new_name != current_name) {
     SetAccessibleName(new_name);
     if (GetWidget())
       NotifyAccessibilityEvent(AccessibilityTypes::EVENT_NAME_CHANGED);
   }
 }