Retry license request on timeouts and errors

media/test/data/eme_player_js/utils.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Utils provide logging functions and other JS functions commonly used by the
 // app and media players.
 var Utils = new function() {
   this.titleChanged = false;
 };
 
@@ skipping 198 matching lines @@
 Utils.resetTitleChange = function() {
   this.titleChanged = false;
   document.title = '';
 };
 
 Utils.sendRequest = function(requestType, responseType, message, serverURL,
                              onSuccessCallbackFn, forceInvalidResponse) {
   var requestAttemptCount = 0;
   var MAXIMUM_REQUEST_ATTEMPTS = 3;
   var REQUEST_RETRY_DELAY_MS = 3000;
+  var REQUEST_TIMEOUT_MS = 1000;
 
   function sendRequestAttempt() {
     requestAttemptCount++;
-    if (requestAttemptCount == MAXIMUM_REQUEST_ATTEMPTS) {
+    if (requestAttemptCount > MAXIMUM_REQUEST_ATTEMPTS) {
       Utils.failTest('FAILED: Exceeded maximum license request attempts.');
       return;
     }
     var xmlhttp = new XMLHttpRequest();
     xmlhttp.responseType = responseType;
     xmlhttp.open(requestType, serverURL, true);
     xmlhttp.onerror = function(e) {
-      Utils.timeLog('Request status: ' + this.statusText);
-      Utils.failTest('FAILED: License request XHR failed with network error.');
+      Utils.timeLog('Request error: ' + this.statusText);
+      Utils.timeLog('Retrying request if possible in ' +
+                    REQUEST_RETRY_DELAY_MS + 'ms');

[sandersd (OOO until July 31), 2014/10/01 17:46:12]

statusText is typically uninformative (it's probably always going to be the
empty string), so the reason should still be in the message.

[jrummell, 2014/10/01 20:49:07]

Done.

+      setTimeout(sendRequestAttempt, REQUEST_RETRY_DELAY_MS);
     };
     xmlhttp.onload = function(e) {
       if (this.status == 200) {
         if (onSuccessCallbackFn)
           onSuccessCallbackFn(this.response);
       } else {
         Utils.timeLog('Bad response status: ' + this.status);
         Utils.timeLog('Bad response: ' + this.response);
         Utils.timeLog('Retrying request if possible in ' +
                       REQUEST_RETRY_DELAY_MS + 'ms');
         setTimeout(sendRequestAttempt, REQUEST_RETRY_DELAY_MS);
       }
     };
+    xmlhttp.timeout = REQUEST_TIMEOUT_MS;
+    xmlhttp.ontimeout = function(e) {
+      Utils.timeLog('Attempt (' + requestAttemptCount + ') timeout');

[sandersd (OOO until July 31), 2014/10/01 17:46:11]

It would be good to format the three kinds of failure as similarly as possible.

[jrummell, 2014/10/01 20:49:07]

Done.

+      Utils.timeLog('Retrying request if possible in ' +
+                    REQUEST_RETRY_DELAY_MS + 'ms');
+      setTimeout(sendRequestAttempt, REQUEST_RETRY_DELAY_MS);
+    }
     Utils.timeLog('Attempt (' + requestAttemptCount +
                   '): sending request to server: ' + serverURL);
     xmlhttp.send(message);
   }
 
   if (forceInvalidResponse) {
     Utils.timeLog('Not sending request - forcing an invalid response.');
     return onSuccessCallbackFn([0xAA]);
   }
   sendRequestAttempt();
@@ skipping 15 matching lines @@
   var time = Utils.getCurrentTimeString();
   // Log to document.
   Utils.documentLog(arguments[0], time);
   // Log to JS console.
   var logString = time + ' - ';
   for (var i = 0; i < arguments.length; i++) {
     logString += ' ' + arguments[i];
   }
   console.log(logString);
 };