WebString: makes string16 conversions explicit (part 1: blink, content)

content/test/test_blink_web_unit_test_support.cc

Index: content/test/test_blink_web_unit_test_support.cc
diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc
index 08c555b1f72661a7b640feb2a2e26f25eca8a206..61d3e2ef879e0cf19e41ffb18f2d81e829da79af 100644
--- a/content/test/test_blink_web_unit_test_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -55,6 +55,8 @@
 #include "third_party/webrtc/base/rtccertificate.h"
 #endif
 
+using blink::WebString;
+
 namespace {
 
 class DummyTaskRunner : public base::SingleThreadTaskRunner {
@@ -215,27 +217,27 @@ blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
   // Returns placeholder strings to check if they are correctly localized.
   switch (name) {
     case blink::WebLocalizedString::OtherDateLabel:
-      return base::ASCIIToUTF16("<<OtherDateLabel>>");
+      return WebString::fromASCII("<<OtherDateLabel>>");
     case blink::WebLocalizedString::OtherMonthLabel:
-      return base::ASCIIToUTF16("<<OtherMonthLabel>>");
+      return WebString::fromASCII("<<OtherMonthLabel>>");
     case blink::WebLocalizedString::OtherTimeLabel:
-      return base::ASCIIToUTF16("<<OtherTimeLabel>>");
+      return WebString::fromASCII("<<OtherTimeLabel>>");
     case blink::WebLocalizedString::OtherWeekLabel:
-      return base::ASCIIToUTF16("<<OtherWeekLabel>>");
+      return WebString::fromASCII("<<OtherWeekLabel>>");
     case blink::WebLocalizedString::CalendarClear:
-      return base::ASCIIToUTF16("<<CalendarClear>>");
+      return WebString::fromASCII("<<CalendarClear>>");
     case blink::WebLocalizedString::CalendarToday:
-      return base::ASCIIToUTF16("<<CalendarToday>>");
+      return WebString::fromASCII("<<CalendarToday>>");
     case blink::WebLocalizedString::ThisMonthButtonLabel:
-      return base::ASCIIToUTF16("<<ThisMonthLabel>>");
+      return WebString::fromASCII("<<ThisMonthLabel>>");
     case blink::WebLocalizedString::ThisWeekButtonLabel:
-      return base::ASCIIToUTF16("<<ThisWeekLabel>>");
+      return WebString::fromASCII("<<ThisWeekLabel>>");
     case blink::WebLocalizedString::ValidationValueMissing:
-      return base::ASCIIToUTF16("<<ValidationValueMissing>>");
+      return WebString::fromASCII("<<ValidationValueMissing>>");
     case blink::WebLocalizedString::ValidationValueMissingForSelect:
-      return base::ASCIIToUTF16("<<ValidationValueMissingForSelect>>");
+      return WebString::fromASCII("<<ValidationValueMissingForSelect>>");
     case blink::WebLocalizedString::WeekFormatTemplate:
-      return base::ASCIIToUTF16("Week $2, $1");
+      return WebString::fromASCII("Week $2, $1");
     default:
       return blink::WebString();
   }
@@ -245,11 +247,11 @@ blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     const blink::WebString& value) {
   if (name == blink::WebLocalizedString::ValidationRangeUnderflow)
-    return base::ASCIIToUTF16("range underflow");
+    return blink::WebString::fromASCII("range underflow");
   if (name == blink::WebLocalizedString::ValidationRangeOverflow)
-    return base::ASCIIToUTF16("range overflow");
+    return blink::WebString::fromASCII("range overflow");
   if (name == blink::WebLocalizedString::SelectMenuListText)
-    return base::ASCIIToUTF16("$1 selected");
+    return blink::WebString::fromASCII("$1 selected");
   return BlinkPlatformImpl::queryLocalizedString(name, value);
 }
 
@@ -258,14 +260,14 @@ blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     const blink::WebString& value1,
     const blink::WebString& value2) {
   if (name == blink::WebLocalizedString::ValidationTooLong)
-    return base::ASCIIToUTF16("too long");
+    return blink::WebString::fromASCII("too long");
   if (name == blink::WebLocalizedString::ValidationStepMismatch)
-    return base::ASCIIToUTF16("step mismatch");
+    return blink::WebString::fromASCII("step mismatch");
   return BlinkPlatformImpl::queryLocalizedString(name, value1, value2);
 }
 
 blink::WebString TestBlinkWebUnitTestSupport::defaultLocale() {
-  return base::ASCIIToUTF16("en-US");
+  return blink::WebString::fromASCII("en-US");
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)