Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

netlog_viewer/netlog_viewer/log_view_painter_test.html

Index: netlog_viewer/netlog_viewer/log_view_painter_test.html
diff --git a/netlog_viewer/netlog_viewer/log_view_painter_test.html b/netlog_viewer/netlog_viewer/log_view_painter_test.html
index 6f2a603da44cb142cf8f889223d2f23ae2f3b4f8..0ab32e7c1d6a5e9fe03c215b3300c26082846af0 100644
--- a/netlog_viewer/netlog_viewer/log_view_painter_test.html
+++ b/netlog_viewer/netlog_viewer/log_view_painter_test.html
@@ -417,7 +417,7 @@ function painterTestURLRequest() {
           'Connection: keep-alive',
           'User-Agent: Mozilla/5.0',
           'Accept: text/html',
-          'Accept-Encoding: gzip,deflate,sdch',
+          'Accept-Encoding: gzip,deflate',
           'Accept-Language: en-US,en;q=0.8',
           'Accept-Charset: ISO-8859-1'
         ],
@@ -821,7 +821,7 @@ function painterTestURLRequest() {
 '                                    Connection: keep-alive\n' +
 '                                    User-Agent: Mozilla/5.0\n' +
 '                                    Accept: text/html\n' +
-'                                    Accept-Encoding: gzip,deflate,sdch\n' +
+'                                    Accept-Encoding: gzip,deflate\n' +
 '                                    Accept-Language: en-US,en;q=0.8\n' +
 '                                    Accept-Charset: ISO-8859-1\n' +
 't=1338864633361 [st=137]     -HTTP_TRANSACTION_SEND_REQUEST\n' +
@@ -1759,7 +1759,7 @@ function painterTestDontStripCookiesURLRequest() {
           'Connection: keep-alive',
           'User-Agent: Mozilla/5.0',
           'Accept: text/html',
-          'Accept-Encoding: gzip,deflate,sdch',
+          'Accept-Encoding: gzip,deflate',
           'Accept-Language: en-US,en;q=0.8',
           'Accept-Charset: ISO-8859-1',
           'Cookie: MyMagicPony'
@@ -1796,7 +1796,7 @@ function painterTestDontStripCookiesURLRequest() {
 '                              Connection: keep-alive\n' +
 '                              User-Agent: Mozilla/5.0\n' +
 '                              Accept: text/html\n' +
-'                              Accept-Encoding: gzip,deflate,sdch\n' +
+'                              Accept-Encoding: gzip,deflate\n' +
 '                              Accept-Language: en-US,en;q=0.8\n' +
 '                              Accept-Charset: ISO-8859-1\n' +
 '                              Cookie: MyMagicPony';
@@ -1836,7 +1836,7 @@ function painterTestDontStripCookiesSPDYSession() {
           ':version: HTTP/1.1',
           'accept: text/html',
           'accept-charset: ISO-8859-1',
-          'accept-encoding: gzip,deflate,sdch',
+          'accept-encoding: gzip,deflate',
           'accept-language: en-US,en;q=0.8',
           'cookie: MyMagicPony',
           'user-agent: Mozilla/5.0'
@@ -1884,7 +1884,7 @@ function painterTestDontStripCookiesSPDYSession() {
     '                               :version: HTTP/1.1\n' +
     '                               accept: text/html\n' +
     '                               accept-charset: ISO-8859-1\n' +
-    '                               accept-encoding: gzip,deflate,sdch\n' +
+    '                               accept-encoding: gzip,deflate\n' +
     '                               accept-language: en-US,en;q=0.8\n' +
     '                               cookie: MyMagicPony\n' +
     '                               user-agent: Mozilla/5.0\n' +