[ServiceWorker] support OPTIONS request for ServiceWorker [3/3 blink]

LayoutTests/http/tests/serviceworker/resources/fetch-request-xhr-iframe.html

 <script src="../../resources/testharness.js"></script>
 <script src="test-helpers.js?pipe=sub"></script>
 <script>
 var host_info = get_host_info();
 
 function get_boundary(headers) {
   var reg = new RegExp('multipart\/form-data; boundary=(.*)');
   for (var i = 0; i < headers.length; ++i) {
     if (headers[i][0] != 'content-type') {
       continue;
@@ skipping 55 matching lines @@
   return xhr_send(host_info['HTTP_ORIGIN'], 'POST', new Blob(['test blob']),
                   false)
     .then(function(response) {
         assert_equals(response.method, 'POST');
         assert_equals(response.body, 'test blob');
       });
 }
 
 function custom_method_test() {
   return xhr_send(host_info['HTTP_ORIGIN'], 'XXX', 'test string xxx', false)
-    .then(function(response){
+    .then(function(response) {
         assert_equals(response.method, 'XXX');
         assert_equals(response.body, 'test string xxx');
       });
 }
 
+function options_method_test() {
+  return xhr_send(host_info['HTTP_ORIGIN'], 'OPTIONS', 'test string xxx', false)
+    .then(function(response) {
+        assert_equals(response.method, 'OPTIONS');
+        assert_equals(response.body, 'test string xxx');
+      });
+}
+
 function form_data_test() {
   return create_file_system_file('fsfile.txt', 'fs file content')
     .then(function(file_system_file) {
         var formData = new FormData();
         formData.append('sample string', '1234567890');
         formData.append('sample blob', new Blob(['blob content']));
         formData.append('sample file', new File(['file content'], 'file.dat'));
         formData.append('sample fs file', file_system_file);
         return xhr_send(host_info['HTTP_ORIGIN'], 'POST', formData, false);
       })
@@ skipping 62 matching lines @@
         };
         xhr.responseType = 'text';
         xhr.open('GET', 'data:text/html,Foobar', true);
         xhr.send();
       })
     .then(function(data) {
         assert_equals(data, 'Foobar');
       });
 }
 
-function xhr_options_test() {
-  return new Promise(function(resolve, reject) {
-        var xhr = new XMLHttpRequest();
-        xhr.onload = function() {
-          resolve(xhr.response);
-        };
-        xhr.onerror = function() {
-          reject('XHR should succeed.');
-        };
-        xhr.responseType = 'text';
-        xhr.open('OpTiOnS', 'fetch-access-control.php', true);
-        xhr.send();
-      })
-    .then(function(data) {
-        var result;
-        var report = function(arg) {
-          result = arg;
-        };
-        eval(data);
-        assert_equals(result['jsonpResult'], 'success');
-        assert_equals(result['method'], 'OPTIONS');
-      })
-}
-
 window.addEventListener('message', function(evt) {
     var port = evt.ports[0];
     string_test()
       .then(blob_test)
       .then(custom_method_test)
+      .then(options_method_test)
       .then(form_data_test)
       .then(mode_credentials_test)
       .then(data_url_test)
-      .then(xhr_options_test)
       .then(function() { port.postMessage({results: 'finish'}); })
       .catch(function(e) { port.postMessage({results: 'failure:' + e}); });
   });
 </script>