Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / text / LocaleWin.cpp

diff --git a/src/third_party/WebKit/Source/platform/text/LocaleWin.cpp b/src/third_party/WebKit/Source/platform/text/LocaleWin.cpp
index f90eafe..c658d02 100644 (file)
--- a/src/third_party/WebKit/Source/platform/text/LocaleWin.cpp
+++ b/src/third_party/WebKit/Source/platform/text/LocaleWin.cpp
@@ -47,7 +47,7 @@
 
 using namespace std;
 
-namespace WebCore {
+namespace blink {
 
 typedef LCID (WINAPI* LocaleNameToLCIDPtr)(LPCWSTR, DWORD);
 typedef HashMap<String, LCID> NameToLCIDMap;
@@ -150,7 +150,7 @@ static LCID LCIDFromLocale(const String& locale, bool defaultsForLocale)
 PassOwnPtr<Locale> Locale::create(const String& locale)
 {
     // Whether the default settings for the locale should be used, ignoring user overrides.
-    bool defaultsForLocale = isRunningLayoutTest();
+    bool defaultsForLocale = LayoutTestSupport::isRunningLayoutTest();
     return LocaleWin::create(LCIDFromLocale(locale, defaultsForLocale), defaultsForLocale);
 }