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

[caseq at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3990facc6fd6094fbb9aa06a66af1ea64049a18d
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 09:48:06 2010 +0000

    2010-12-17  Andrey Kosyakov  <caseq at chromium.org>
    
            Unreviewed test fix: removed real user agent from test expectations.
    
            * http/tests/inspector/extensions-headers-expected.txt:
            * http/tests/inspector/extensions-headers.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 44ffc51..328b1ac 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-17  Andrey Kosyakov  <caseq at chromium.org>
 
+        Unreviewed test fix: removed real user agent from test expectations.
+
+        * http/tests/inspector/extensions-headers-expected.txt:
+        * http/tests/inspector/extensions-headers.html:
+
+2010-12-17  Andrey Kosyakov  <caseq at chromium.org>
+
         Unreviewed. Clean up extra headers set in test to avoid side effects on other tests.
 
         * http/tests/inspector/extensions-headers-expected.txt:
diff --git a/LayoutTests/http/tests/inspector/extensions-headers-expected.txt b/LayoutTests/http/tests/inspector/extensions-headers-expected.txt
index 97b09a0..3e67a16 100644
--- a/LayoutTests/http/tests/inspector/extensions-headers-expected.txt
+++ b/LayoutTests/http/tests/inspector/extensions-headers-expected.txt
@@ -2,8 +2,6 @@ Tests WebInspector extension API
 
 HTTP_X_WEBINSPECTOR_EXTENSION: test
 HTTP_USER_AGENT: Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)
-HTTP_X_WEBINSPECTOR_EXTENSION: 
-HTTP_USER_AGENT: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533+ (KHTML, like Gecko)
 Started extension.
 Running tests...
 RUNNING TEST: extension_testAddHeaders
diff --git a/LayoutTests/http/tests/inspector/extensions-headers.html b/LayoutTests/http/tests/inspector/extensions-headers.html
index 2ab4fbc..5538774 100644
--- a/LayoutTests/http/tests/inspector/extensions-headers.html
+++ b/LayoutTests/http/tests/inspector/extensions-headers.html
@@ -16,9 +16,8 @@ function extension_testAddHeaders(nextTest)
             "x-webinspector-extension": null,
             "user-agent": null
         });
-        webInspector.inspectedWindow.eval("doXHR()", nextTest);
     }
-    webInspector.inspectedWindow.eval("doXHR()", cleanUpHeaders);
+    webInspector.inspectedWindow.eval("doXHR()", callbackAndNextTest(cleanUpHeaders, nextTest));
 }
 
 function doXHR()

-- 
WebKit Debian packaging