Revert 71167 - Remove wstring from gfx....

chrome/browser/chromeos/login/oobe_progress_bar.cc

 // Copyright (c) 2010 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/chromeos/login/oobe_progress_bar.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 93 matching lines @@
 
     if (i != steps_.size() - 1)
       canvas->DrawBitmapInt(*line_after, ix, y + line_offset_y);
     ix += line_after->width();
 
     if (i != steps_.size() - 1) {
       canvas->TileImageInt(*line_, ix, y + line_offset_y,
                            next_x - ix, line_->height());
     }
 
-    string16 str = l10n_util::GetStringUTF16(steps_[i]);
+    std::wstring str = UTF16ToWide(l10n_util::GetStringUTF16(steps_[i]));
     canvas->DrawStringInt(str, font_, color,
         x + kTextPadding, y + dot->height() + kTextPadding,
         (next_x - x - 2 * kTextPadding),
         (bounds.height() - dot->height() - 2 * kTextPadding),
         gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER |
             gfx::Canvas::TEXT_VALIGN_TOP);
 
     x = next_x;
   }
 }
 
 void OobeProgressBar::OnLocaleChanged() {
   SchedulePaint();
 }
 
 void OobeProgressBar::SetStep(int step) {
   for (size_t i = 0; i < steps_.size(); ++i) {
     if (steps_[i] == step) {
       progress_ = i;
       SchedulePaint();
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace chromeos