Use explicit WebString conversions in LayoutTest related files

content/test/test_blink_web_unit_test_support.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/test_blink_web_unit_test_support.h"
 
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 37 matching lines @@
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
 #include "gin/v8_initializer.h"  // nogncheck
 #endif
 
 #if BUILDFLAG(ENABLE_WEBRTC)
 #include "content/renderer/media/rtc_certificate.h"
 #include "third_party/WebKit/public/platform/WebRTCCertificateGenerator.h"
 #include "third_party/webrtc/base/rtccertificate.h"  // nogncheck
 #endif
 
+using blink::WebString;
+
 namespace {
 
 class DummyTaskRunner : public base::SingleThreadTaskRunner {
  public:
   DummyTaskRunner() : thread_id_(base::PlatformThread::CurrentId()) {}
 
   bool PostDelayedTask(const tracked_objects::Location& from_here,
                        const base::Closure& task,
                        base::TimeDelta delay) override {
     // Drop the delayed task.
@@ skipping 140 matching lines @@
     const blink::WebSize& size) {
   return shared_bitmap_manager_
       ->AllocateSharedBitmap(gfx::Size(size.width, size.height));
 }
 
 blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name) {
   // 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();
   }
 }
 
 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);
 }
 
 blink::WebString TestBlinkWebUnitTestSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     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)
 void TestBlinkWebUnitTestSupport::SetThemeEngine(
     blink::WebThemeEngine* engine) {
   active_theme_engine_ = engine ? engine : BlinkPlatformImpl::themeEngine();
 }
 
 blink::WebThemeEngine* TestBlinkWebUnitTestSupport::themeEngine() {
   return active_theme_engine_;
@@ skipping 68 matching lines @@
 blink::WebRTCCertificateGenerator*
 TestBlinkWebUnitTestSupport::createRTCCertificateGenerator() {
 #if BUILDFLAG(ENABLE_WEBRTC)
   return new TestWebRTCCertificateGenerator();
 #else
   return nullptr;
 #endif
 }
 
 }  // namespace content