Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece

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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/shared_memory.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 1325 matching lines @@
                        "%d,%s",   // texts in the third <div> element
                        key_code, kModifierData[j].expected_result,
                        static_cast<int>(char_code[0]),
                        kModifierData[j].expected_result,
                        key_code, kModifierData[j].expected_result);
 
         // Retrieve the text in the test page and compare it with the expected
         // text created from a virtual-key code, a character code, and the
         // modifier-key status.
         const int kMaxOutputCharacters = 1024;
-        std::string output = base::UTF16ToUTF8(
-            GetMainFrame()->contentAsText(kMaxOutputCharacters));
+        std::string output = base::UTF16ToUTF8(base::StringPiece16(
+            GetMainFrame()->contentAsText(kMaxOutputCharacters)));
         EXPECT_EQ(expected_result, output);
       }
     }
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 // Test that our EditorClientImpl class can insert characters when we send
@@ skipping 547 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(
-      GetMainFrame()->contentAsText(kMaxOutputCharacters));
+  std::string output = base::UTF16ToUTF8(base::StringPiece16(
+      GetMainFrame()->contentAsText(kMaxOutputCharacters)));
   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, GetSSLStatusOfFrame) {
@@ skipping 100 matching lines @@
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.url = GURL("data:text/html,test data");
   TestRenderFrame* main_frame = static_cast<TestRenderFrame*>(frame());
   main_frame->Navigate(common_params, StartNavigationParams(),
                        RequestNavigationParams());
 
   // An error occurred.
   main_frame->didFailProvisionalLoad(web_frame, error,
                                      blink::WebStandardCommit);
   const int kMaxOutputCharacters = 22;
-  EXPECT_EQ("",
-            base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
+  EXPECT_EQ("", base::UTF16ToASCII(
+      base::StringPiece16(web_frame->contentAsText(kMaxOutputCharacters))));
 }
 
 #if defined(OS_ANDROID)
 // Crashing on Android: http://crbug.com/311341
 #define MAYBE_DoesNotSuppress DISABLED_DoesNotSuppress
 #else
 #define MAYBE_DoesNotSuppress DoesNotSuppress
 #endif
 
 TEST_F(RendererErrorPageTest, MAYBE_DoesNotSuppress) {
@@ skipping 13 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(web_frame->contentAsText(kMaxOutputCharacters)));
+            base::UTF16ToASCII(base::StringPiece16(
+                web_frame->contentAsText(kMaxOutputCharacters))));
 }
 
 #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 @@
                        RequestNavigationParams());
 
   // Emulate a 4xx/5xx main resource response with an empty body.
   main_frame->didReceiveResponse(web_frame, 1, response);
   main_frame->didFinishDocumentLoad(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(web_frame->contentAsText(kMaxOutputCharacters)));
+            base::UTF16ToASCII(base::StringPiece16(
+                web_frame->contentAsText(kMaxOutputCharacters))));
 }
 
 // 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 241 matching lines @@
       FROM_HERE,
       base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScriptForTests("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content