Use explicit WebString conversions in remaining content files

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 170 matching lines @@
 // by content-layer, renderer code (still the constructed, partial
 // FrameReplicationState is sufficiently complete to avoid trigerring
 // asserts that a default/empty FrameReplicationState would).
 FrameReplicationState ReconstructReplicationStateForTesting(
     TestRenderFrame* test_render_frame) {
   blink::WebLocalFrame* frame = test_render_frame->GetWebFrame();
 
   FrameReplicationState result;
   // can't recover result.scope - no way to get WebTreeScopeType via public
   // blink API...
-  result.name = base::UTF16ToUTF8(base::StringPiece16(frame->assignedName()));
-  result.unique_name =
-      base::UTF16ToUTF8(base::StringPiece16(frame->uniqueName()));
+  result.name = frame->assignedName().utf8();
+  result.unique_name = frame->uniqueName().utf8();
   result.sandbox_flags = frame->effectiveSandboxFlags();
   // result.should_enforce_strict_mixed_content_checking is calculated in the
   // browser...
   result.origin = frame->getSecurityOrigin();
 
   return result;
 }
 
 // Returns CommonNavigationParams for a normal navigation to a data: url, with
 // navigation_start set to Now() plus the given offset.
@@ skipping 1064 matching lines @@
     // TODO(hbono): we should verify messages to be sent from the back-end.
     view()->UpdateTextInputState();
     ProcessPendingMessages();
     render_thread_->sink().ClearMessages();
 
     if (ime_message->result) {
       // Retrieve the content of this page and compare it with the expected
       // result.
       const int kMaxOutputCharacters = 128;
       base::string16 output = WebFrameContentDumper::dumpWebViewAsText(
-          view()->GetWebView(), kMaxOutputCharacters);
+                                  view()->GetWebView(), kMaxOutputCharacters)
+                                  .utf16();
       EXPECT_EQ(base::WideToUTF16(ime_message->result), output);
     }
   }
 }
 
 // Test that the RenderView::OnSetTextDirection() function can change the text
 // direction of the selected input element.
 TEST_F(RenderViewImplTest, OnSetTextDirection) {
   // Load an HTML page consisting of a <textarea> element and a <div> element.
   // This test changes the text direction of the <textarea> element, and
@@ skipping 28 matching lines @@
         "var node = document.getElementById('test');"
         "var style = getComputedStyle(node, null);"
         "result.innerText ="
         "    node.getAttribute('dir') + ',' +"
         "    style.getPropertyValue('direction');");
 
     // Copy the document content to std::wstring and compare with the
     // expected result.
     const int kMaxOutputCharacters = 16;
     base::string16 output = WebFrameContentDumper::dumpWebViewAsText(
-        view()->GetWebView(), kMaxOutputCharacters);
+                                view()->GetWebView(), kMaxOutputCharacters)
+                                .utf16();
     EXPECT_EQ(base::WideToUTF16(kTextDirection[i].expected_result), output);
   }
 }
 
 // Crashy, http://crbug.com/53247.
 TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) {
   GetMainFrame()->enableViewSourceMode(true);
   WebURLError error;
   error.domain = WebString::fromUTF8(net::kErrorDomain);
   error.reason = net::ERR_FILE_NOT_FOUND;
@@ skipping 347 matching lines @@
 
   TestRenderFrame* subframe =
       static_cast<TestRenderFrame*>(RenderFrameImpl::FromWebFrame(
           view()->webview()->findFrameByName("frame")));
   subframe->Navigate(common_params, StartNavigationParams(), request_params);
   FrameLoadWaiter(subframe).Wait();
 
   // Copy the document content to std::wstring and compare with the
   // expected result.
   const int kMaxOutputCharacters = 256;
-  std::string output = base::UTF16ToUTF8(
-      base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
-          view()->GetWebView(), kMaxOutputCharacters)));
+  std::string output = WebFrameContentDumper::dumpWebViewAsText(
+                           view()->GetWebView(), kMaxOutputCharacters)
+                           .utf8();
   EXPECT_EQ(output, "hello  \n\nworld");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
 // frame in the RenderView.
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
   EXPECT_TRUE(view()->main_render_frame_);
 }
 
 TEST_F(RenderViewImplTest, MessageOrderInDidChangeSelection) {
@@ skipping 119 matching lines @@
                        RequestNavigationParams());
 
   // An error occurred.
   main_frame->didFailProvisionalLoad(web_frame, error,
                                      blink::WebStandardCommit);
 
   // The error page itself is loaded asynchronously.
   FrameLoadWaiter(main_frame).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
-            base::UTF16ToASCII(
-                base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
-                    view()->GetWebView(), kMaxOutputCharacters))));
+            WebFrameContentDumper::dumpWebViewAsText(view()->GetWebView(),
+                                                     kMaxOutputCharacters)
+                .ascii());
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_HttpStatusCodeErrorWithEmptyBody \
   DISABLED_HttpStatusCodeErrorWithEmptyBody
 #else
 #define MAYBE_HttpStatusCodeErrorWithEmptyBody HttpStatusCodeErrorWithEmptyBody
 #endif
 TEST_F(RendererErrorPageTest, MAYBE_HttpStatusCodeErrorWithEmptyBody) {
@@ skipping 12 matching lines @@
 
   // Emulate a 4xx/5xx main resource response with an empty body.
   main_frame->didReceiveResponse(response);
   main_frame->didFinishDocumentLoad(web_frame);
   main_frame->runScriptsAtDocumentReady(web_frame, true);
 
   // The error page itself is loaded asynchronously.
   FrameLoadWaiter(main_frame).Wait();
   const int kMaxOutputCharacters = 22;
   EXPECT_EQ("A suffusion of yellow.",
-            base::UTF16ToASCII(
-                base::StringPiece16(WebFrameContentDumper::dumpWebViewAsText(
-                    view()->GetWebView(), kMaxOutputCharacters))));
+            WebFrameContentDumper::dumpWebViewAsText(view()->GetWebView(),
+                                                     kMaxOutputCharacters)
+                .ascii());
 }
 
 // Ensure the render view sends favicon url update events correctly.
 TEST_F(RenderViewImplTest, SendFaviconURLUpdateEvent) {
   // An event should be sent when a favicon url exists.
   LoadHTML("<html>"
            "<head>"
            "<link rel='icon' href='http://www.google.com/favicon.ico'>"
            "</head>"
            "</html>");
@@ skipping 670 matching lines @@
   ExpectPauseAndResume(3);
   blink::WebScriptSource source2(
       WebString::fromUTF8("function func2() { func1(); }; func2();"));
   frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
 
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content