fix(ngRoute): make route.resolve count as a pending request

Protractor users were having a problem where if they had asynchonous code in a route.resolve variable, Protractor was not waiting for that code to complete before continuing.  See angular/protractor#789 (comment) for details

Author: sjelin

src/ngRoute/route.js

@@ -350,7 +350,8 @@ function $RouteProvider() {
                '$injector',
                '$templateRequest',
                '$sce',
-      function($rootScope, $location, $routeParams, $q, $injector, $templateRequest, $sce) {
+               '$browser',
+      function($rootScope, $location, $routeParams, $q, $injector, $templateRequest, $sce, $browser) {
 
     /**
      * @ngdoc service
@@ -776,6 +777,7 @@ function $RouteProvider() {
 
     function resolveLocals(route) {
       if (route) {
+        $browser.$$incOutstandingRequestCount();
         var locals = angular.extend({}, route.resolve);
         angular.forEach(locals, function(value, key) {
           locals[key] = angular.isString(value) ?
@@ -786,7 +788,10 @@ function $RouteProvider() {
         if (angular.isDefined(template)) {
           locals['$template'] = template;
         }
-        return $q.all(locals);
+        return $q.all(locals).then(function(locals) {
+          $browser.$$completeOutstandingRequest(function() {});
+          return locals;
+        });
       }
     }