Have Locale::create() take a String in argument

Source/platform/text/LocaleWin.cpp

 /*
  * Copyright (C) 2012 Google Inc. 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
@@ skipping 110 matching lines @@
 }
 
 static LCID LCIDFromLocaleInternal(LCID userDefaultLCID, const String& userDefaultLanguageCode, LocaleNameToLCIDPtr localeNameToLCID, const String& locale)
 {
     String localeLanguageCode = extractLanguageCode(locale);
     if (equalIgnoringCase(localeLanguageCode, userDefaultLanguageCode))
         return userDefaultLCID;
     return localeNameToLCID(locale.charactersWithNullTermination().data(), 0);
 }
 
-static LCID LCIDFromLocale(const AtomicString& locale, bool defaultsForLocale)
+static LCID LCIDFromLocale(const String& locale, bool defaultsForLocale)
 {
     // LocaleNameToLCID() is available since Windows Vista.
     LocaleNameToLCIDPtr localeNameToLCID = reinterpret_cast<LocaleNameToLCIDPtr>(::GetProcAddress(::GetModuleHandle(L"kernel32"), "LocaleNameToLCID"));
     if (!localeNameToLCID)
         localeNameToLCID = convertLocaleNameToLCID;
 
     // According to MSDN, 9 is enough for LOCALE_SISO639LANGNAME.
     const size_t languageCodeBufferSize = 9;
     WCHAR lowercaseLanguageCode[languageCodeBufferSize];
     ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SISO639LANGNAME | (defaultsForLocale ? LOCALE_NOUSEROVERRIDE : 0), lowercaseLanguageCode, languageCodeBufferSize);
     String userDefaultLanguageCode = String(lowercaseLanguageCode);
 
-    LCID lcid = LCIDFromLocaleInternal(LOCALE_USER_DEFAULT, userDefaultLanguageCode, localeNameToLCID, String(locale));
+    LCID lcid = LCIDFromLocaleInternal(LOCALE_USER_DEFAULT, userDefaultLanguageCode, localeNameToLCID, locale);
     if (!lcid)
         lcid = LCIDFromLocaleInternal(LOCALE_USER_DEFAULT, userDefaultLanguageCode, localeNameToLCID, defaultLanguage());
     return lcid;
 }
 
-PassOwnPtr<Locale> Locale::create(const AtomicString& locale)
+PassOwnPtr<Locale> Locale::create(const String& locale)
 {
     // Whether the default settings for the locale should be used, ignoring user overrides.
     bool defaultsForLocale = isRunningLayoutTest();
     return LocaleWin::create(LCIDFromLocale(locale, defaultsForLocale), defaultsForLocale);
 }
 
 inline LocaleWin::LocaleWin(LCID lcid, bool defaultsForLocale)
     : m_lcid(lcid)
     , m_didInitializeNumberData(false)
     , m_defaultsForLocale(defaultsForLocale)
@@ skipping 416 matching lines @@
     case NegativeFormatSignPrefix: // Fall through.
     default:
         negativePrefix = negativeSign;
         break;
     }
     m_didInitializeNumberData = true;
     setLocaleData(symbols, emptyString(), emptyString(), negativePrefix, negativeSuffix);
 }
 
 }