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

content/public/test/render_view_test.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 "content/public/test/render_view_test.h"
 
 #include <stddef.h>
 
 #include <cctype>
 
@@ skipping 154 matching lines @@
 }
 
 void RenderViewTest::ExecuteJavaScriptForTests(const char* js) {
   GetMainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(js)));
 }
 
 bool RenderViewTest::ExecuteJavaScriptAndReturnIntValue(
     const base::string16& script,
     int* int_result) {
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
-  v8::Local<v8::Value> result =
-      GetMainFrame()->executeScriptAndReturnValue(WebScriptSource(script));
+  v8::Local<v8::Value> result = GetMainFrame()->executeScriptAndReturnValue(
+      WebScriptSource(blink::WebString::fromUTF16(script)));
   if (result.IsEmpty() || !result->IsInt32())
     return false;
 
   if (int_result)
     *int_result = result->Int32Value();
 
   return true;
 }
 
 void RenderViewTest::LoadHTML(const char* html) {
@@ skipping 477 matching lines @@
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
   view_->GetWebView()->updateAllLifecyclePhases();
 }
 
 }  // namespace content