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..ccd8dead3b3a78cfc8cc3d7864cda4b4d408b57e 100644
--- a/appengine/gaetesting/middleware.go
+++ b/appengine/gaetesting/middleware.go
@@ -5,25 +5,21 @@
 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"
 )
 
-// BaseTest adapts a middleware-style handler to a httprouter.Handle. It passes
-// a new context to `h` with the following services installed:
+// BaseTest is a middleware that passes a new context to the next handler
+// 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(c *router.Context, next router.Handler) {
+	c.Context = TestingContext()
+	next(c)
 }
 
 // TestingContext returns context with base services installed.