[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[thakis at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6c6e202a20f7751892bc6c644629fabee5413783
Author: thakis at chromium.org <thakis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 18:32:42 2010 +0000

    2010-09-30  Nico Weber  <thakis at chromium.org>
    
            Reviewed by Adam Barth.
    
            [chromium] Fix clang error in KURLTest.cpp
            https://bugs.webkit.org/show_bug.cgi?id=46861
    
            * tests/KURLTest.cpp:
            (WTF::operator<<):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68810 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index fdb8b38..1e380e2 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-30  Nico Weber  <thakis at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium] Fix clang error in KURLTest.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=46861
+
+        * tests/KURLTest.cpp:
+        (WTF::operator<<):
+
 2010-09-30  Daniel Cheng  <dcheng at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/chromium/tests/KURLTest.cpp b/WebKit/chromium/tests/KURLTest.cpp
index c46da2a..152dd31 100644
--- a/WebKit/chromium/tests/KURLTest.cpp
+++ b/WebKit/chromium/tests/KURLTest.cpp
@@ -37,13 +37,16 @@
 
 #include "KURL.h"
 
-namespace {
-
+namespace WTF {
 // Output stream operator so gTest's macros work with WebCore strings.
-std::ostream& operator<<(std::ostream& out, const WTF::String& str)
+std::ostream& operator<<(std::ostream& out, const String& str)
 {
     return str.isEmpty() ? out : out << str.utf8().data();
 }
+} // namespace WTF
+
+namespace {
+
 
 struct ComponentCase {
     const char* url;

-- 
WebKit Debian packaging