Add some helper methods for constructing a WebCString from UTF16 input,

assuming a UTF16 to UTF8 conversion.  Also, includes a .utf16() method on
WebCString to get a UTF16 string out.  These methods mirror the similar
methods for UTF8 on WebString.

Make use of these conversion methods in a few more places.

R=dglazkov
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/164274

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23010 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 6 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d78dcd3..ce9870f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -927,7 +927,7 @@ void RenderView::UpdateURL(WebFrame* frame) {
     // Top-level navigation.
 
     // Update contents MIME type for main frame.
-    params.contents_mime_type = UTF16ToUTF8(ds->response().mimeType());
+    params.contents_mime_type = ds->response().mimeType().utf8();
 
     params.transition = navigation_state->transition_type();
     if (!PageTransition::IsMainFrame(params.transition)) {
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 93662af..a9bbc43 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -202,7 +202,7 @@ WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
   const std::map<std::string, std::string>::const_iterator iter =
       unicode_font_families_.find(key);
   if (iter != unicode_font_families_.end())
-    return WebString::fromUTF8(iter->second.data(), iter->second.size());
+    return WebString::fromUTF8(iter->second);
 
   const std::string family_name =
       renderer_sandbox_support::getFontFamilyForCharacters(characters,
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc
index 4b2eb2f..07e8746 100644
--- a/chrome/renderer/user_script_slave.cc
+++ b/chrome/renderer/user_script_slave.cc
@@ -144,9 +144,8 @@ bool UserScriptSlave::InjectScripts(WebFrame* frame,
           content.insert(0, kUserScriptHead);
           content += kUserScriptTail;
         }
-        sources.push_back(WebScriptSource(
-            WebString::fromUTF8(content.c_str(), content.length()),
-            file.url()));
+        sources.push_back(
+            WebScriptSource(WebString::fromUTF8(content), file.url()));
       }
     }
 
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index e36126d..4e35eff 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -833,7 +833,7 @@ static void EncodeDragData(const WebDragData& data, bool add_data,
     static const char kBackspaceDelimiter('\b');
     if (i != 0)
       utf8.append(1, kBackspaceDelimiter);
-    utf8.append(UTF16ToUTF8(files[i]));
+    utf8.append(files[i].utf8());
   }
 
   STRINGN_TO_NPVARIANT(utf8.data(), utf8.length(), *drag_data);