Use explicit WebString conversions in translate code

components/translate/content/renderer/translate_helper.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 "components/translate/content/renderer/translate_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLanguageDetectionDetails.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "url/gurl.h"
 #include "v8/include/v8.h"
 
-using base::ASCIIToUTF16;
 using blink::WebDocument;
 using blink::WebLocalFrame;
 using blink::WebScriptSource;
 using blink::WebSecurityOrigin;
 using blink::WebString;
 using blink::WebVector;
 using blink::WebLanguageDetectionDetails;
 
 namespace {
 
@@ skipping 138 matching lines @@
   // Just converts |delayInMs| without any modification in practical cases.
   // Tests will override this function to return modified value.
   return base::TimeDelta::FromMilliseconds(delayInMs);
 }
 
 void TranslateHelper::ExecuteScript(const std::string& script) {
   WebLocalFrame* main_frame = render_frame()->GetWebFrame();
   if (!main_frame)
     return;
 
-  WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
+  WebScriptSource source = WebScriptSource(WebString::fromASCII(script));
   main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1);
 }
 
 bool TranslateHelper::ExecuteScriptAndGetBoolResult(const std::string& script,
                                                     bool fallback) {
   WebLocalFrame* main_frame = render_frame()->GetWebFrame();
   if (!main_frame)
     return fallback;
 
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   WebVector<v8::Local<v8::Value> > results;
-  WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
+  WebScriptSource source = WebScriptSource(WebString::fromASCII(script));
   main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
   if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsBoolean()) {
     NOTREACHED();
     return fallback;
   }
 
   return results[0]->BooleanValue();
 }
 
 std::string TranslateHelper::ExecuteScriptAndGetStringResult(
     const std::string& script) {
   WebLocalFrame* main_frame = render_frame()->GetWebFrame();
   if (!main_frame)
     return std::string();
 
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   WebVector<v8::Local<v8::Value> > results;
-  WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
+  WebScriptSource source = WebScriptSource(WebString::fromASCII(script));
   main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
   if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsString()) {
     NOTREACHED();
     return std::string();
   }
 
   v8::Local<v8::String> v8_str = results[0].As<v8::String>();
   int length = v8_str->Utf8Length() + 1;
   std::unique_ptr<char[]> str(new char[length]);
   v8_str->WriteUtf8(str.get(), length);
   return std::string(str.get());
 }
 
 double TranslateHelper::ExecuteScriptAndGetDoubleResult(
     const std::string& script) {
   WebLocalFrame* main_frame = render_frame()->GetWebFrame();
   if (!main_frame)
     return 0.0;
 
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   WebVector<v8::Local<v8::Value> > results;
-  WebScriptSource source = WebScriptSource(ASCIIToUTF16(script));
+  WebScriptSource source = WebScriptSource(WebString::fromASCII(script));
   main_frame->executeScriptInIsolatedWorld(world_id_, &source, 1, &results);
   if (results.size() != 1 || results[0].IsEmpty() || !results[0]->IsNumber()) {
     NOTREACHED();
     return 0.0;
   }
 
   return results[0]->NumberValue();
 }
 
 // mojom::Page implementations.
@@ skipping 167 matching lines @@
   binding_.Close();
   translate_callback_pending_.Reset();
   CancelPendingTranslation();
 }
 
 void TranslateHelper::OnDestruct() {
   delete this;
 }
 
 }  // namespace translate