Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / util / language_selector.cc

diff --git a/src/chrome/installer/util/language_selector.cc b/src/chrome/installer/util/language_selector.cc
index 0dc3f58..c0a31bb 100644 (file)
--- a/src/chrome/installer/util/language_selector.cc
+++ b/src/chrome/installer/util/language_selector.cc
@@ -11,6 +11,7 @@
 #include <functional>
 
 #include "base/logging.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/win/i18n.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -190,7 +191,7 @@ bool MatchLanguageOffset(const std::wstring& language, int* offset) {
 // configured languages.
 void GetCandidatesFromSystem(std::vector<std::wstring>* candidates) {
   DCHECK(candidates);
-  std::wstring language;
+  base::string16 language;
 
   // Omaha gets first pick.
   GoogleUpdateSettings::GetLanguage(&language);
@@ -261,7 +262,7 @@ bool LanguageSelector::SelectIf(const std::vector<std::wstring>& candidates,
   for (std::vector<std::wstring>::const_iterator scan = candidates.begin(),
           end = candidates.end(); scan != end; ++scan) {
     candidate.assign(*scan);
-    StringToLowerASCII(&candidate);
+    base::StringToLowerASCII(&candidate);
     if (select_predicate(candidate, matched_offset)) {
       matched_name->assign(*scan);
       return true;