changed some comments

Author: sjelin

src/ng/browser.js

@@ -321,7 +321,7 @@ function Browser(window, document, $log, $sniffer) {
    */
   self.defer = function(fn, delay) {
     var timeoutId;
-    outstandingRequestCount++;
+    self.$$incOutstandingRequestCount();
     timeoutId = setTimeout(function() {
       delete pendingDeferIds[timeoutId];
       completeOutstandingRequest(fn);

src/ngMock/angular-mocks.js

@@ -43,11 +43,14 @@ angular.mock.$Browser = function() {
   var outstandingRequestCallbacks = [];
   self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; };
   self.$$completeOutstandingRequest = function(fn) {
-    fn();
-    outstandingRequestCount--;
-    if (!outstandingRequestCount) {
-      while (outstandingRequestCallbacks.length) {
-        outstandingRequestCallbacks.pop()();
+    try {
+      fn();
+    } finally {
+      outstandingRequestCount--;
+      if (!outstandingRequestCount) {
+        while (outstandingRequestCallbacks.length) {
+          outstandingRequestCallbacks.pop()();
+        }
       }
     }
   };
@@ -82,6 +85,8 @@ angular.mock.$Browser = function() {
   self.deferredNextId = 0;
 
   self.defer = function(fn, delay) {
+    // Note that we do not use `$$incOutstandingRequestCount` or `$$completeOutstandingRequest`
+    // in this mock implementation.
     delay = delay || 0;
     self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id: self.deferredNextId});
     self.deferredFns.sort(function(a, b) { return a.time - b.time;});

src/ngRoute/route.js

@@ -706,6 +706,11 @@ function $RouteProvider() {
               $rootScope.$broadcast('$routeChangeError', nextRoute, lastRoute, error);
             }
           }).finally(function() {
+            // Because `commitRoute()` is called from a `$rootScope.$evalAsync` block (see
+            // `$locationWatch`), this `$$completeOutstandingRequest()` call will not cause
+            // `outstandingRequestCount` to hit zero.  This is important in case we are redirecting
+            // to a new route which also requires some asynchronous work.
+
             $browser.$$completeOutstandingRequest(noop);
           });
       }

test/ngRoute/routeSpec.js

@@ -2199,13 +2199,10 @@ describe('$route', function() {
 
       module(function($provide, $routeProvider) {
         // While normally `$browser.defer()` modifies the `outstandingRequestCount`, the mocked
-        // version (provided by `ngMock`) does not. This doesn't matter in most tests, but it does
-        // here:
-        // `$browser.defer()` will be indirectly called as a result of `$locationWatch`'s call to
-        // `$rootScope.$evalAsync()`. In the async function, the `$locationChangeSuccess` event will
-        // be broadcasted, which will in turn trigger `commitRoute()` in `ngRoute`.
-        // `outstandingRequestCount` must not reach 0 during the time between calling
-        // `$rootScope.$evalAsync()` and executing the async function.
+        // version (provided by `ngMock`) does not. This doesn't matter in most tests, but in this
+        // case we need the `outstandingRequestCount` logic to ensure that we don't call the
+        // `$$testability.whenStable()` callbacks part way through a `$rootScope.$evalAsync` block.
+        // See ngRoute's commitRoute()'s finally() block for details.
         $provide.decorator('$browser', function($delegate) {
           var oldDefer = $delegate.defer;
           var newDefer = function(fn, delay) {