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

src/extensions/experimental/i18n-extension.cc

Index: src/extensions/experimental/i18n-extension.cc
diff --git a/src/extensions/experimental/i18n-extension.cc b/src/extensions/experimental/i18n-extension.cc
index f14fd9e30f7a59cc945a17c4c0f95f621f3ba0b0..e65fdcc846bbde1eb2629359fad1ed1367333d3c 100644
--- a/src/extensions/experimental/i18n-extension.cc
+++ b/src/extensions/experimental/i18n-extension.cc
@@ -167,7 +167,7 @@ v8::Handle<v8::Value> I18NExtension::JSAvailableLocales(
   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()));
   }
@@ -230,7 +230,7 @@ static v8::Handle<v8::Value> GetDisplayItem(const v8::Arguments& args,
   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") {