[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[brettw at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 35b7ddad5d851278d930410de37e79c8acf8e79e
Author: brettw at chromium.org <brettw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 23:47:21 2010 +0000

    2010-02-26  Brett Wilson  <brettw at chromium.org>
    
            Fix chromium build. This test's expectation became obsolete with
            recent changes to KURL which my previous change brings Chromium's
            port in compliance with.
    
            * tests/KURLTest.cpp:
            (ComponentCase::TEST):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0a6d76f..ed3368e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26  Brett Wilson  <brettw at chromium.org>
+
+        Fix chromium build. This test's expectation became obsolete with
+        recent changes to KURL which my previous change brings Chromium's
+        port in compliance with.
+
+        * tests/KURLTest.cpp:
+        (ComponentCase::TEST):
+
 2010-02-26  Yaar Schnitman  <yaar at chromium.org>
 
         Chromium build fix.
diff --git a/WebKit/chromium/tests/KURLTest.cpp b/WebKit/chromium/tests/KURLTest.cpp
index b316683..6be4966 100644
--- a/WebKit/chromium/tests/KURLTest.cpp
+++ b/WebKit/chromium/tests/KURLTest.cpp
@@ -381,10 +381,11 @@ TEST(KURLTest, ReplaceInvalid)
     EXPECT_FALSE(kurl.isEmpty());
     EXPECT_STREQ("http://www.google.com:8000/favicon.ico", kurl.string().utf8().data());
 
-    // Now let's test that giving an invalid replacement still fails.
+    // Now let's test that giving an invalid replacement fails. Invalid
+    // protocols fail without modifying the URL, which should remain valid.
 #if USE(GOOGLEURL)
-    kurl.setProtocol("f/sj#@");
-    EXPECT_FALSE(kurl.isValid());
+    EXPECT_FALSE(kurl.setProtocol("f/sj#@"));
+    EXPECT_TRUE(kurl.isValid());
 #endif
 }
 

-- 
WebKit Debian packaging