Index: third_party/WebKit/Source/platform/text/LocaleWinTest.cpp |
diff --git a/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp b/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp |
index 70930c09c0708f4d9b52f57528f40aa76d6cba91..898fe5bf5d456fa0559c22d5e395c15f534317e9 100644 |
--- a/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp |
+++ b/third_party/WebKit/Source/platform/text/LocaleWinTest.cpp |
@@ -34,8 +34,8 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "wtf/DateMath.h" |
#include "wtf/MathExtras.h" |
+#include "wtf/PassOwnPtr.h" |
#include "wtf/text/CString.h" |
-#include <memory> |
namespace blink { |
@@ -84,67 +84,67 @@ protected: |
String formatDate(LCID lcid, int year, int month, int day) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->formatDateTime(getDateComponents(year, month, day)); |
} |
unsigned firstDayOfWeek(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->firstDayOfWeek(); |
} |
String monthLabel(LCID lcid, unsigned index) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->monthLabels()[index]; |
} |
String weekDayShortLabel(LCID lcid, unsigned index) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->weekDayShortLabels()[index]; |
} |
bool isRTL(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->isRTL(); |
} |
String monthFormat(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->monthFormat(); |
} |
String timeFormat(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->timeFormat(); |
} |
String shortTimeFormat(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->shortTimeFormat(); |
} |
String shortMonthLabel(LCID lcid, unsigned index) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->shortMonthLabels()[index]; |
} |
String timeAMPMLabel(LCID lcid, unsigned index) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->timeAMPMLabels()[index]; |
} |
String decimalSeparator(LCID lcid) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
return locale->localizedDecimalSeparator(); |
} |
}; |
@@ -261,7 +261,7 @@ TEST_F(LocaleWinTest, decimalSeparator) |
static void testNumberIsReversible(LCID lcid, const char* original, const char* shouldHave = 0) |
{ |
- std::unique_ptr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
+ OwnPtr<LocaleWin> locale = LocaleWin::create(lcid, true /* defaultsForLocale */); |
String localized = locale->convertToLocalizedNumber(original); |
if (shouldHave) |
EXPECT_TRUE(localized.contains(shouldHave)); |