Make it possible to initialize KURLGoogle from a CString. This is so that I...

webkit/glue/glue_util.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 "webkit/glue/glue_util.h"
 #include "base/compiler_specific.h"
 #include "base/gfx/rect.h"
@@ skipping 74 matching lines @@
   return GURL(spec.data(), spec.length(), url.parsed(), url.isValid());
 #else
   return StringToGURL(url.string());
 #endif
 }
 
 WebCore::KURL GURLToKURL(const GURL& url) {
   const std::string& spec = url.possibly_invalid_spec();
 #if USE(GOOGLEURL)
   // Convert using the internal structures to avoid re-parsing.
-  return WebCore::KURL(spec.c_str(), static_cast<int>(spec.length()),
-                       url.parsed_for_possibly_invalid_spec(), url.is_valid());
+  return WebCore::KURL(
+      WebCore::CString(spec.c_str(), static_cast<int>(spec.length())),
+      url.parsed_for_possibly_invalid_spec(), url.is_valid());
 #else
   return WebCore::KURL(StdWStringToString(UTF8ToWide(spec)));
 #endif
 }
 
 GURL StringToGURL(const WebCore::String& spec) {
   return GURL(WideToUTF8(StringToStdWString(spec)));
 }
 
 // Rect conversions ------------------------------------------------------------
 
 gfx::Rect FromIntRect(const WebCore::IntRect& r) {
     return gfx::Rect(r.x(), r.y(), r.width() < 0 ? 0 : r.width(),
         r.height() < 0 ? 0 : r.height());
 }
 
 WebCore::IntRect ToIntRect(const gfx::Rect& r) {
   return WebCore::IntRect(r.x(), r.y(), r.width(), r.height());
 }
 
 }  // namespace webkit_glue