Make HTTP middleware easier to use

appengine/gaetesting/middleware.go

Index: appengine/gaetesting/middleware.go
diff --git a/appengine/gaetesting/middleware.go b/appengine/gaetesting/middleware.go
index 2cedb18cdf4041cde0331af3ca04bf58d6c9c151..1798f9d95af4b592c7230e7a450ce5f8ea70c77f 100644
--- a/appengine/gaetesting/middleware.go
+++ b/appengine/gaetesting/middleware.go
@@ -5,14 +5,11 @@
 package gaetesting
 
 import (
-	"net/http"
-
-	"github.com/julienschmidt/httprouter"
 	"golang.org/x/net/context"
 
 	"github.com/luci/gae/impl/memory"
-	"github.com/luci/luci-go/server/middleware"
 	"github.com/luci/luci-go/server/proccache"
+	"github.com/luci/luci-go/server/router"
 	"github.com/luci/luci-go/server/secrets/testsecrets"
 )
 
@@ -20,9 +17,9 @@ import (
 // a new context to `h` with the following services installed:
 //   * github.com/luci/gae/impl/memory (in-memory appengine services)
 //   * github.com/luci/luci-go/server/secrets/testsecrets (access to fake secret keys)
-func BaseTest(h middleware.Handler) httprouter.Handle {
-	return func(rw http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		h(TestingContext(), rw, r, p)
+func BaseTest() router.Handler {
+	return func(c *router.Context) {
+		c.Context = TestingContext()
 	}
 }