Rollback the rollback of r1806. Wasn't the cause of the test failure.

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 #include <string>
 #include <vector>
 
 #pragma warning(push, 0)
 #include "Chrome.h"
@@ skipping 996 matching lines @@
 void WebFrameLoaderClient::setMainFrameDocumentReady(bool ready) {
   // FIXME
 }
 
 // Creates a new connection and begins downloading from that (contrast this
 // with |download|).
 void WebFrameLoaderClient::startDownload(const ResourceRequest& request) {
   WebViewDelegate* d = webframe_->webview_impl()->delegate();
   if (d) {
     const GURL url(webkit_glue::KURLToGURL(request.url()));
-    const GURL referrer(webkit_glue::StringToStdWString(request.httpReferrer()));
+    const GURL referrer(webkit_glue::StringToStdString(request.httpReferrer()));
     d->DownloadUrl(url, referrer);
   }
 }
 
 void WebFrameLoaderClient::willChangeTitle(DocumentLoader*) {
   // FIXME
 }
 void WebFrameLoaderClient::didChangeTitle(DocumentLoader*) {
   // FIXME
 }
@@ skipping 138 matching lines @@
   // FIXME
   return false;
 }
 
 String WebFrameLoaderClient::generatedMIMETypeForURLScheme(const String& URLScheme) const {
   // This appears to generate MIME types for protocol handlers that are handled
   // internally. The only place I can find in the WebKit code that uses this
   // function is WebView::registerViewClass, where it is used as part of the
   // process by which custom view classes for certain document representations
   // are registered.
-  String mimetype(L"x-apple-web-kit/");
+  String mimetype("x-apple-web-kit/");
   mimetype.append(URLScheme.lower());
   return mimetype;
 }
 
 void WebFrameLoaderClient::frameLoadCompleted() {
   // FIXME: the mac port also conditionally calls setDrawsBackground:YES on
   // it's ScrollView here.
 
   // This comment from the Mac port:
   // Note: Can be called multiple times.
@@ skipping 110 matching lines @@
 }
 
 // Utility function to convert a vector to an array of char*'s.
 // Caller is responsible to free memory with DeleteToArray().
 static char** ToArray(const Vector<WebCore::String> &vector) {
   char **rv = new char *[vector.size()+1];
   unsigned int index = 0;
   for (index = 0; index < vector.size(); ++index) {
     WebCore::CString src = vector[index].utf8();
     rv[index] = new char[src.length() + 1];
-    strncpy_s(rv[index], src.length() + 1, src.data(), _TRUNCATE);
+    base::strlcpy(rv[index], src.data(), src.length() + 1);
     rv[index][src.length()] = '\0';
   }
   rv[index] = 0;
   return rv;
 }
 
 static void DeleteToArray(char** arr) {
   char **ptr = arr;
   while (*ptr != 0) {
     delete [] *ptr;
@@ skipping 167 matching lines @@
     return false;
 
   DCHECK(disposition);
   if (middle_or_ctrl)
     *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   else
     *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK;
   return true;
 }