Replace std:;wstring with std::string in locale-name related APIs....

app/resource_bundle_linux.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 "app/resource_bundle.h"
 
 #include <gtk/gtk.h>
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
@@ skipping 77 matching lines @@
 
   locale_resources_data_ = new base::DataPack;
   success = locale_resources_data_->Load(locale_path);
   DCHECK(success) << "failed to load locale pak file";
 }
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
   PathService::Get(app::DIR_LOCALES, &locale_path);
 
-  const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
+  const std::string app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
     return FilePath();
 
-  return locale_path.Append(WideToASCII(app_locale + L".pak"));
+  return locale_path.AppendASCII(app_locale + ".pak");
 }
 
 void ResourceBundle::LoadThemeResources() {
   FilePath theme_data_path;
   PathService::Get(app::DIR_THEMES, &theme_data_path);
   theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
   theme_data_ = new base::DataPack;
   bool success = theme_data_->Load(theme_data_path);
   DCHECK(success) << "failed to load theme data";
 }
@@ skipping 86 matching lines @@
       // This bitmap will be leaked, but this code should never be hit.
       scoped_ptr<SkBitmap> skia_bitmap(new SkBitmap());
       skia_bitmap->setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
       skia_bitmap->allocPixels();
       skia_bitmap->eraseARGB(255, 255, 0, 0);
       empty_bitmap = gfx::GdkPixbufFromSkBitmap(skia_bitmap.get());
     }
     return empty_bitmap;
   }
 }