[ServiceWorker] Update formatting for tests.

LayoutTests/http/tests/serviceworker/resources/request-worker.js

Index: LayoutTests/http/tests/serviceworker/resources/request-worker.js
diff --git a/LayoutTests/http/tests/serviceworker/resources/request-worker.js b/LayoutTests/http/tests/serviceworker/resources/request-worker.js
index 8dea6edce641a80c76b268dd24f1900317b6b3c9..947480eba18ae115c0be72029c766ddab63e58c5 100644
--- a/LayoutTests/http/tests/serviceworker/resources/request-worker.js
+++ b/LayoutTests/http/tests/serviceworker/resources/request-worker.js
@@ -22,23 +22,30 @@ test(function() {
 
     assert_equals(request.url, URL, 'Request.url should match');
     assert_equals(request.method, 'GET', 'Request.method should match');
-    assert_equals(request.referrer, location.href, 'Request.referrer should match');
-    assert_true(request.headers instanceof Headers, 'Request.headers should be Headers');
+    assert_equals(request.referrer, location.href,
+                  'Request.referrer should match');
+    assert_true(request.headers instanceof Headers,
+                'Request.headers should be Headers');
 
     // 'User-Agent' is a forbidden header.
-    assert_equals(size(request.headers), 2, 'Request.headers size should match');
+    assert_equals(size(request.headers), 2,
+                  'Request.headers size should match');
     // Note: detailed behavioral tests for Headers are in another test,
     // http/tests/serviceworker/headers.html.
 
     request.url = 'http://localhost/';
-    assert_equals(request.url, 'https://www.example.com/test.html', 'Request.url should be readonly');
-    request = new Request('http://localhost/\uD800'); // Unmatched lead surrogate.
+    assert_equals(request.url, 'https://www.example.com/test.html',
+                  'Request.url should be readonly');
+
+    // Unmatched lead surrogate.
+    request = new Request('http://localhost/\uD800');
     assert_equals(request.url,
                   'http://localhost/' + encodeURIComponent('\uFFFD'),
                   'Request.url should have unmatched surrogates replaced.');
+
     request.method = 'POST';
     assert_equals(request.method, 'GET', 'Request.method should be readonly');
-}, 'Request basic test in ServiceWorkerGlobalScope');
+  }, 'Request basic test in ServiceWorkerGlobalScope');
 
 test(function() {
     [new Request(URL),
@@ -46,13 +53,18 @@ test(function() {
      new Request(URL, {mode: ''}),
      new Request(URL, {mode: 'invalid mode'}),
      new Request(URL, {credentials: ''}),
-     new Request(URL, {credentials: 'invalid credentials'})].forEach(function(request) {
-        assert_equals(request.url, URL, 'Request.url should match');
-        assert_equals(request.method, 'GET', 'Default Request.method should be GET');
-        assert_equals(request.mode, 'cors', 'Default Request.mode should be cors');
-        assert_equals(request.credentials, 'omit', 'Default Request.credentials should be omit');
-    });
-}, 'Request default value test in ServiceWorkerGlobalScope');
+     new Request(URL, {credentials: 'invalid credentials'})]
+      .forEach(function(request) {
+          assert_equals(request.url, URL,
+                        'Request.url should match');
+          assert_equals(request.method, 'GET',
+                        'Default Request.method should be GET');
+          assert_equals(request.mode, 'cors',
+                        'Default Request.mode should be cors');
+          assert_equals(request.credentials, 'omit',
+                        'Default Request.credentials should be omit');
+        });
+  }, 'Request default value test in ServiceWorkerGlobalScope');
 
 test(function() {
     var request = new Request(URL);
@@ -63,28 +75,31 @@ test(function() {
     assert_equals(request2.url, URL, 'Request.url should match');
     assert_equals(request2.method, 'GET', 'Request.method should match');
     assert_equals(request2.mode, 'cors', 'Request.mode should match');
-    assert_equals(request2.credentials, 'omit', 'Request.credentials should match');
+    assert_equals(request2.credentials, 'omit',
+                  'Request.credentials should match');
     assert_equals(request2.headers.getAll('X-ServiceWorker-Foo')[0], 'foo1',
                   'Request.headers should match');
     assert_equals(request2.headers.getAll('X-ServiceWorker-Foo')[1], 'foo2',
                   'Request.headers should match');
     assert_equals(request2.headers.getAll('X-ServiceWorker-Bar')[0], 'bar',
                   'Request.headers should match');
-    var request3 = new Request(URL, {headers: [['X-ServiceWorker-Foo', 'foo1'],
-                                               ['X-ServiceWorker-Foo', 'foo2'],
-                                               ['X-ServiceWorker-Bar', 'bar']]});
+    var request3 = new Request(URL,
+                               {headers: [['X-ServiceWorker-Foo', 'foo1'],
+                                          ['X-ServiceWorker-Foo', 'foo2'],
+                                          ['X-ServiceWorker-Bar', 'bar']]});
     assert_equals(request3.headers.getAll('X-ServiceWorker-Foo')[0], 'foo1',
                   'Request.headers should match');
     assert_equals(request3.headers.getAll('X-ServiceWorker-Foo')[1], 'foo2',
                   'Request.headers should match');
     assert_equals(request3.headers.getAll('X-ServiceWorker-Bar')[0], 'bar',
                   'Request.headers should match');
-}, 'Request header test in ServiceWorkerGlobalScope');
+  }, 'Request header test in ServiceWorkerGlobalScope');
 
 test(function() {
     var request1 = {};
     var request2 = {};
-    var METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS', '', undefined];
+    var METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS', '',
+                   undefined];
     var MODES = ['same-origin', 'no-cors', 'cors', '', undefined];
     function isSimpleMethod(method) {
       return ['GET', 'HEAD', 'POST', '', undefined].indexOf(method) != -1;
@@ -101,18 +116,23 @@ test(function() {
             if (method1 != undefined) { init1['method'] = method1; }
             if (mode1 != undefined) { init1['mode'] = mode1; }
             if (!isSimpleMethod(method1) && mode1 == 'no-cors') {
-                assert_throws(
-                    {name:'TypeError'},
-                    function() { request1 = new Request(URL, init1); },
-                    'new no-cors Request with non simple method (' + method1 +') should throw');
-                return;
+              assert_throws(
+                {name: 'TypeError'},
+                function() { request1 = new Request(URL, init1); },
+                'new no-cors Request with non simple method (' + method1 +
+                ') should throw');
+              return;
             }
             request1 = new Request(URL, init1);
-            assert_equals(request1.method, method1 ? method1 : 'GET', 'Request.method should match');
-            assert_equals(request1.mode, mode1 ? mode1 : 'cors', 'Request.mode should match');
+            assert_equals(request1.method, method1 ? method1 : 'GET',
+                          'Request.method should match');
+            assert_equals(request1.mode, mode1 ? mode1 : 'cors',
+                          'Request.mode should match');
             request1 = new Request(request1);
-            assert_equals(request1.method, method1 ? method1 : 'GET', 'Request.method should match');
-            assert_equals(request1.mode, mode1 ? mode1 : 'cors', 'Request.mode should match');
+            assert_equals(request1.method, method1 ? method1 : 'GET',
+                          'Request.method should match');
+            assert_equals(request1.mode, mode1 ? mode1 : 'cors',
+                          'Request.mode should match');
             METHODS.forEach(function(method2) {
                 MODES.forEach(function(mode2) {
                     // We need to construct a new request1 because as soon as it
@@ -122,12 +142,14 @@ test(function() {
                     var init2 = {};
                     if (method2 != undefined) { init2['method'] = method2; }
                     if (mode2 != undefined) { init2['mode'] = mode2; }
-                    if (!isSimpleMethod(effectiveMethod(method1, method2)) && effectiveMode(mode1, mode2) == 'no-cors') {
-                        assert_throws(
-                            {name:'TypeError'},
-                            function() { request2 = new Request(request1, init2); },
-                            'new no-cors Request with non simple method should throw');
-                        return;
+                    if (!isSimpleMethod(effectiveMethod(method1, method2)) &&
+                        effectiveMode(mode1, mode2) == 'no-cors') {
+                      assert_throws(
+                        {name: 'TypeError'},
+                        function() { request2 = new Request(request1, init2); },
+                        'new no-cors Request with non simple method should ' +
+                        'throw');
+                      return;
                     }
                     request2 = new Request(request1, init2);
                     assert_equals(request2.method,
@@ -136,11 +158,11 @@ test(function() {
                     assert_equals(request2.mode,
                                   mode2 ? mode2 : request1.mode,
                                   'Request.mode should be overridden');
-                });
-            });
-        });
-    });
-}, 'Request header test in ServiceWorkerGlobalScope');
+                  });
+              });
+          });
+      });
+  }, 'Request header test in ServiceWorkerGlobalScope');
 
 test(function() {
     var request1 = {};
@@ -150,97 +172,108 @@ test(function() {
         var init1 = {};
         if (credentials1 != undefined) { init1['credentials'] = credentials1; }
         request1 = new Request(URL, init1);
-        assert_equals(request1.credentials, credentials1 ? credentials1 : 'omit', 'Request.credentials should match');
+        assert_equals(request1.credentials, credentials1 || 'omit',
+                      'Request.credentials should match');
         request1 = new Request(request1);
-        assert_equals(request1.credentials, credentials1 ? credentials1 : 'omit', 'Request.credentials should match');
+        assert_equals(request1.credentials, credentials1 || 'omit',
+                      'Request.credentials should match');
         CREDENTIALS.forEach(function(credentials2) {
             request1 = new Request(URL, init1);
             var init2 = {};
-            if (credentials2 != undefined) { init2['credentials'] = credentials2; }
+            if (credentials2 != undefined) {
+              init2['credentials'] = credentials2;
+            }
             request2 = new Request(request1, init2);
             assert_equals(request2.credentials,
                           credentials2 ? credentials2 : request1.credentials,
                           'Request.credentials should be overridden');
-        });
-    });
-}, 'Request credentials test in ServiceWorkerGlobalScope');
+          });
+      });
+  }, 'Request credentials test in ServiceWorkerGlobalScope');
 
 test(function() {
     ['same-origin', 'cors', 'no-cors'].forEach(function(mode) {
         var forbiddenMethods = ['TRACE', 'TRACK', 'CONNECT'];
         forbiddenMethods.forEach(function(method) {
             assert_throws(
-                {name:'TypeError'},
-                function() { var request = new Request(URL, {mode: mode, method: method}); },
-                'new Request with a forbidden method (' + method +') should throw');
-        });
+              {name: 'TypeError'},
+              function() {
+                var request = new Request(URL, {mode: mode, method: method});
+              },
+              'new Request with a forbidden method (' + method + ') should ' +
+              'throw');
+          });
         var invalidNames = ['(', ')', '<', '>', '@', ',', ';', ':', '\\', '"',
                             '/', '[', ']', '?', '=', '{', '}', '\u3042', 'a(b',
                             'invalid name'];
         invalidNames.forEach(function(name) {
             assert_throws(
-                {name:'TypeError'},
-                function() { var request = new Request(URL, {mode: mode, method: name}); },
-                'new Request with an invalid method (' + name +') should throw');
-        });
-    });
-}, 'Request method name test in ServiceWorkerGlobalScope');
+              {name: 'TypeError'},
+              function() {
+                var request = new Request(URL, {mode: mode, method: name});
+              },
+              'new Request with an invalid method (' + name + ') should throw');
+          });
+      });
+  }, 'Request method name test in ServiceWorkerGlobalScope');
 
 test(function() {
     var FORBIDDEN_HEADERS =
-        ['Accept-Charset', 'Accept-Encoding', 'Access-Control-Request-Headers',
-         'Access-Control-Request-Method', 'Connection', 'Content-Length', 'Cookie',
-         'Cookie2', 'Date', 'DNT', 'Expect', 'Host', 'Keep-Alive', 'Origin',
-         'Referer', 'TE', 'Trailer', 'Transfer-Encoding', 'Upgrade', 'User-Agent',
-         'Via', 'Proxy-', 'Sec-', 'Proxy-FooBar', 'Sec-FooBar'];
+      ['Accept-Charset', 'Accept-Encoding', 'Access-Control-Request-Headers',
+       'Access-Control-Request-Method', 'Connection', 'Content-Length',
+       'Cookie', 'Cookie2', 'Date', 'DNT', 'Expect', 'Host', 'Keep-Alive',
+       'Origin', 'Referer', 'TE', 'Trailer', 'Transfer-Encoding', 'Upgrade',
+       'User-Agent', 'Via', 'Proxy-', 'Sec-', 'Proxy-FooBar', 'Sec-FooBar'];
     var SIMPLE_HEADERS =
-        [['Accept', '*'], ['Accept-Language', 'ru'], ['Content-Language', 'ru'],
-         ['Content-Type', 'application/x-www-form-urlencoded'],
-         ['Content-Type', 'multipart/form-data'],
-         ['Content-Type', 'text/plain']];
+      [['Accept', '*'], ['Accept-Language', 'ru'], ['Content-Language', 'ru'],
+       ['Content-Type', 'application/x-www-form-urlencoded'],
+       ['Content-Type', 'multipart/form-data'],
+       ['Content-Type', 'text/plain']];
     var NON_SIMPLE_HEADERS =
-        [['X-ServiceWorker-Test', 'test'],
-         ['X-ServiceWorker-Test2', 'test2'],
-         ['Content-Type', 'foo/bar']];
+      [['X-ServiceWorker-Test', 'test'],
+       ['X-ServiceWorker-Test2', 'test2'],
+       ['Content-Type', 'foo/bar']];
 
-   ['same-origin', 'cors'].forEach(function(mode) {
+    ['same-origin', 'cors'].forEach(function(mode) {
         var request = new Request(URL, {mode: mode});
         FORBIDDEN_HEADERS.forEach(function(header) {
             request.headers.append(header, 'test');
             assert_equals(size(request.headers), 0,
-                          'Request.headers.append should ignore the forbidden headers');
+                          'Request.headers.append should ignore the ' +
+                          'forbidden headers');
             request.headers.set(header, 'test');
             assert_equals(size(request.headers), 0,
-                          'Request.headers.set should ignore the forbidden headers');
-        });
+                          'Request.headers.set should ignore the forbidden ' +
+                          'headers');
+          });
         var request = new Request(URL, {mode: mode});
         assert_equals(size(request.headers), 0);
         NON_SIMPLE_HEADERS.forEach(function(header) {
             request.headers.append(header[0], header[1]);
-        });
+          });
         assert_equals(size(request.headers), NON_SIMPLE_HEADERS.length);
         NON_SIMPLE_HEADERS.forEach(function(header) {
             assert_equals(request.headers.get(header[0]), header[1]);
-        });
+          });
         request = new Request(URL, {mode: mode});
         assert_equals(size(request.headers), 0);
         NON_SIMPLE_HEADERS.forEach(function(header) {
             request.headers.set(header[0], header[1]);
-        });
+          });
         assert_equals(size(request.headers), NON_SIMPLE_HEADERS.length);
         NON_SIMPLE_HEADERS.forEach(function(header) {
             assert_equals(request.headers.get(header[0]), header[1]);
-        });
-    });
+          });
+      });
     request = new Request(URL, {mode: 'no-cors'});
     FORBIDDEN_HEADERS.forEach(function(header) {
         request.headers.set(header, 'test');
         request.headers.append(header, 'test');
-    });
+      });
     NON_SIMPLE_HEADERS.forEach(function(header) {
         request.headers.set(header[0], header[1]);
         request.headers.append(header[0], header[1]);
-    });
+      });
     assert_equals(size(request.headers), 0,
                   'no-cors request should only accept simple headers');
 
@@ -255,106 +288,120 @@ test(function() {
                       'no-cors request should accept simple headers');
         request.headers.delete(header[0]);
         if (header[0] == 'Content-Type') {
-            assert_equals(
-                size(request.headers), 1,
-                'Content-Type header of no-cors request shouldn\'t be deleted');
+          assert_equals(
+            size(request.headers), 1,
+            'Content-Type header of no-cors request shouldn\'t be deleted');
         } else {
-            assert_equals(size(request.headers), 0);
+          assert_equals(size(request.headers), 0);
         }
-    });
+      });
 
     SIMPLE_HEADERS.forEach(function(header) {
         var headers = {};
         NON_SIMPLE_HEADERS.forEach(function(header2) {
             headers[header2[0]] = header2[1];
-        });
-        FORBIDDEN_HEADERS.forEach(function(header) { headers[header] = 'foo'; });
+          });
+        FORBIDDEN_HEADERS.forEach(function(header) {
+            headers[header] = 'foo';
+          });
         headers[header[0]] = header[1];
         var expectedSize = NON_SIMPLE_HEADERS.length;
         if (header[0] != 'Content-Type') {
-            ++expectedSize;
+          ++expectedSize;
         }
         ['same-origin', 'cors'].forEach(function(mode) {
-          request = new Request(URL, {mode: mode, headers: headers});
-          assert_equals(size(request.headers), expectedSize,
-                        'Request should not support the forbidden headers');
-        });
+            request = new Request(URL, {mode: mode, headers: headers});
+            assert_equals(size(request.headers), expectedSize,
+                          'Request should not support the forbidden headers');
+          });
         request = new Request(URL, {mode: 'no-cors', headers: headers});
         assert_equals(size(request.headers), 1,
-                      'No-CORS Request.headers should only support simple headers');
+                      'No-CORS Request.headers should only support simple ' +
+                      'headers');
         ['same-origin', 'cors', 'no-cors'].forEach(function(mode) {
-            request = new Request(new Request(URL, {mode: mode, headers: headers}), {mode: 'no-cors'});
+            request = new Request(
+              new Request(URL, {mode: mode, headers: headers}),
+              {mode: 'no-cors'});
             assert_equals(size(request.headers), 1,
-                          'No-CORS Request.headers should only support simple headers');
-        });
-    });
-}, 'Request headers test in ServiceWorkerGlobalScope');
+                          'No-CORS Request.headers should only support ' +
+                          'simple headers');
+          });
+      });
+  }, 'Request headers test in ServiceWorkerGlobalScope');
 
 test(function() {
-  var url = 'http://example.com';
-  ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT'].forEach(function(method) {
-    assert_equals(new Request(url, {method: method.toLowerCase()}).method,
-                  method,
-                  'method should be normalized to uppercase: ' + method);
-  });
+    var url = 'http://example.com';
+    ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT'].forEach(
+      function(method) {
+        assert_equals(new Request(url, {method: method.toLowerCase()}).method,
+                      method,
+                      'method should be normalized to uppercase: ' + method);
+      });
 
-  ['PATCH', 'MKCOL', 'CUSTOM', 'X-FILES'].forEach(function(method) {
-    assert_equals(new Request(url, {method: method}).method, method,
-                  'method should not be changed when normalized: ' + method);
-    method = method.toLowerCase();
-    assert_equals(new Request(url, {method: method}).method, method,
-                  'method should not be changed when normalized: ' + method);
-  });
-}, 'Request method names are normalized');
+    ['PATCH', 'MKCOL', 'CUSTOM', 'X-FILES'].forEach(
+      function(method) {
+        assert_equals(new Request(url, {method: method}).method, method,
+                      'method should not be changed when normalized: ' +
+                      method);
+        method = method.toLowerCase();
+        assert_equals(new Request(url, {method: method}).method, method,
+                      'method should not be changed when normalized: ' +
+                      method);
+      });
+  }, 'Request method names are normalized');
 
 test(function() {
     var req = new Request(URL);
     assert_false(req.bodyUsed,
-      "Request should not be flagged as used if it has not been consumed.");
+                 'Request should not be flagged as used if it has not been ' +
+                 'consumed.');
     var req2 = new Request(req);
     assert_true(req.bodyUsed,
-      "Request should be flagged as used if it is used as a construction " +
-      "argument of another Request.");
+                'Request should be flagged as used if it is used as a ' +
+                'construction argument of another Request.');
     assert_false(req2.bodyUsed,
-      "Request should not be flagged as used if it has not been consumed.");
+                 'Request should not be flagged as used if it has not been ' +
+                 'consumed.');
     assert_throws(new TypeError(), function() { new Request(req); },
-      "Request cannot be constructed with a request that has been flagged as used.");
-  }, 'Request construction behavior regarding "used" body flag and exceptions.');
+                  'Request cannot be constructed with a request that has ' +
+                  'been flagged as used.');
+  },
+  'Request construction behavior regarding "used" body flag and exceptions.');
 
 promise_test(function() {
-  var headers = new Headers;
-  headers.set('Content-Language', 'ja');
-  var req = new Request(URL, {
-    method: 'GET',
-    headers: headers,
-    body: new Blob(['Test Blob'], {type: 'test/type'})
-  });
-  var req2 = req.clone();
-  // Change headers and of original request.
-  req.headers.set('Content-Language', 'en');
-  assert_equals(
-    req2.headers.get('Content-Language'), 'ja', 'Headers of cloned request ' +
-    'should not change when original request headers are changed.');
-
-  return req.text()
-    .then(function(text) {
-        assert_equals(text, 'Test Blob', 'Body of request should match.');
-        return req2.text();
-      })
-    .then(function(text) {
-        assert_equals(text, 'Test Blob', 'Cloned request body should match.');
+    var headers = new Headers;
+    headers.set('Content-Language', 'ja');
+    var req = new Request(URL, {
+        method: 'GET',
+        headers: headers,
+        body: new Blob(['Test Blob'], {type: 'test/type'})
       });
+    var req2 = req.clone();
+    // Change headers and of original request.
+    req.headers.set('Content-Language', 'en');
+    assert_equals(req2.headers.get('Content-Language'), 'ja',
+                  'Headers of cloned request should not change when ' +
+                  'original request headers are changed.');
+
+    return req.text()
+      .then(function(text) {
+          assert_equals(text, 'Test Blob', 'Body of request should match.');
+          return req2.text();
+        })
+      .then(function(text) {
+          assert_equals(text, 'Test Blob', 'Cloned request body should match.');
+        });
   }, 'Test clone behavior with loading content from Request.');
 
 async_test(function(t) {
     var getContentType = function(headers) {
-        var content_type = '';
-        for (var header of headers) {
-          if (header[0] == 'content-type')
-            content_type = header[1];
-        }
-        return content_type;
-      };
+      var content_type = '';
+      for (var header of headers) {
+        if (header[0] == 'content-type')
+          content_type = header[1];
+      }
+      return content_type;
+    };
     var request =
       new Request(URL,
                   {
@@ -381,7 +428,7 @@ async_test(function(t) {
           assert_equals(result, 'Test String',
                         'Creating a Request with string body should success.');
 
-          var text = "Test ArrayBuffer";
+          var text = 'Test ArrayBuffer';
           var array = new Uint8Array(text.length);
           for (var i = 0; i < text.length; ++i)
             array[i] = text.charCodeAt(i);
@@ -393,7 +440,7 @@ async_test(function(t) {
             result, 'Test ArrayBuffer',
             'Creating a Request with ArrayBuffer body should success.');
 
-          var text = "Test ArrayBufferView";
+          var text = 'Test ArrayBufferView';
           var array = new Uint8Array(text.length);
           for (var i = 0; i < text.length; ++i)
             array[i] = text.charCodeAt(i);