Use explicit WebString conversions in extensions/

extensions/renderer/dom_activity_logger.cc

 // Copyright 2014 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 "extensions/renderer/dom_activity_logger.h"
 
 #include <utility>
 
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_thread.h"
@@ skipping 45 matching lines @@
     DOMActivityLogger* logger = new DOMActivityLogger(extension_id);
     blink::setDOMActivityLogger(world_id,
                                 WebString::fromUTF8(extension_id),
                                 logger);
   }
 }
 
 void DOMActivityLogger::logGetter(const WebString& api_name,
                                   const WebURL& url,
                                   const WebString& title) {
-  SendDomActionMessage(api_name.utf8(), url, title, DomActionType::GETTER,
+  SendDomActionMessage(api_name.utf8(), url, title.utf16(),
+                       DomActionType::GETTER,
                        std::unique_ptr<base::ListValue>(new base::ListValue()));
 }
 
 void DOMActivityLogger::logSetter(const WebString& api_name,
                                   const v8::Local<v8::Value>& new_value,
                                   const WebURL& url,
                                   const WebString& title) {
   logSetter(api_name, new_value, v8::Local<v8::Value>(), url, title);
 }
 
 void DOMActivityLogger::logSetter(const WebString& api_name,
                                   const v8::Local<v8::Value>& new_value,
                                   const v8::Local<v8::Value>& old_value,
                                   const WebURL& url,
                                   const WebString& title) {
   std::unique_ptr<base::ListValue> args(new base::ListValue);
   std::string api_name_utf8 = api_name.utf8();
   AppendV8Value(api_name_utf8, new_value, args.get());
   if (!old_value.IsEmpty())
     AppendV8Value(api_name_utf8, old_value, args.get());
-  SendDomActionMessage(api_name_utf8, url, title, DomActionType::SETTER,
+  SendDomActionMessage(api_name_utf8, url, title.utf16(), DomActionType::SETTER,
                        std::move(args));
 }
 
 void DOMActivityLogger::logMethod(const WebString& api_name,
                                   int argc,
                                   const v8::Local<v8::Value>* argv,
                                   const WebURL& url,
                                   const WebString& title) {
   std::unique_ptr<base::ListValue> args(new base::ListValue);
   std::string api_name_utf8 = api_name.utf8();
   for (int i = 0; i < argc; ++i)
     AppendV8Value(api_name_utf8, argv[i], args.get());
-  SendDomActionMessage(api_name_utf8, url, title, DomActionType::METHOD,
+  SendDomActionMessage(api_name_utf8, url, title.utf16(), DomActionType::METHOD,
                        std::move(args));
 }
 
 void DOMActivityLogger::logEvent(const WebString& event_name,
                                  int argc,
                                  const WebString* argv,
                                  const WebURL& url,
                                  const WebString& title) {
   std::unique_ptr<base::ListValue> args(new base::ListValue);
   std::string event_name_utf8 = event_name.utf8();
   for (int i = 0; i < argc; ++i)
-    args->AppendString(argv[i]);
-  SendDomActionMessage(event_name_utf8, url, title, DomActionType::METHOD,
-                       std::move(args));
+    args->AppendString(argv[i].utf16());
+  SendDomActionMessage(event_name_utf8, url, title.utf16(),
+                       DomActionType::METHOD, std::move(args));
 }
 
 void DOMActivityLogger::SendDomActionMessage(
     const std::string& api_call,
     const GURL& url,
     const base::string16& url_title,
     DomActionType::Type call_type,
     std::unique_ptr<base::ListValue> args) {
   ExtensionHostMsg_DOMAction_Params params;
   params.api_call = api_call;
   params.url = url;
   params.url_title = url_title;
   params.call_type = call_type;
   params.arguments.Swap(args.get());
   content::RenderThread::Get()->Send(
       new ExtensionHostMsg_AddDOMActionToActivityLog(extension_id_, params));
 }
 
 }  // namespace extensions