Revert "[Arguments] Merge (7442,7496] from bleeding_edge."

src/extensions/experimental/i18n-extension.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 149 matching lines @@
 
   return locale;
 }
 
 // TODO(cira): Filter out locales that Chrome doesn't support.
 v8::Handle<v8::Value> I18NExtension::JSAvailableLocales(
     const v8::Arguments& args) {
   v8::Local<v8::Array> all_locales = v8::Array::New();
 
   int count = 0;
-  const icu::Locale* icu_locales = icu::Locale::getAvailableLocales(count);
+  const Locale* icu_locales = icu::Locale::getAvailableLocales(count);
   for (int i = 0; i < count; ++i) {
     all_locales->Set(i, v8::String::New(icu_locales[i].getName()));
   }
 
   return all_locales;
 }
 
 // Use - as tag separator, not _ that ICU uses.
 static std::string NormalizeLocale(const std::string& locale) {
   std::string result(locale);
@@ skipping 42 matching lines @@
 static v8::Handle<v8::Value> GetDisplayItem(const v8::Arguments& args,
                                             const std::string& item) {
   if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString()) {
     return v8::Undefined();
   }
 
   std::string base_locale = *v8::String::Utf8Value(args[0]->ToString());
   icu::Locale icu_locale(base_locale.c_str());
   icu::Locale display_locale =
       icu::Locale(*v8::String::Utf8Value(args[1]->ToString()));
-  icu::UnicodeString result;
+  UnicodeString result;
   if (item == "language") {
     icu_locale.getDisplayLanguage(display_locale, result);
   } else if (item == "script") {
     icu_locale.getDisplayScript(display_locale, result);
   } else if (item == "region") {
     icu_locale.getDisplayCountry(display_locale, result);
   } else if (item == "name") {
     icu_locale.getDisplayName(display_locale, result);
   } else {
     return v8::Undefined();
@@ skipping 31 matching lines @@
     extension_ = new I18NExtension();
   }
   return extension_;
 }
 
 void I18NExtension::Register() {
   static v8::DeclareExtension i18n_extension_declaration(I18NExtension::get());
 }
 
 } }  // namespace v8::internal