Make HTTP middleware easier to use

appengine/gaeauth/server/default.go

Index: appengine/gaeauth/server/default.go
diff --git a/appengine/gaeauth/server/default.go b/appengine/gaeauth/server/default.go
index 937f3f23906dc6414d80ca09ab93f4b36f4900f8..ef97197adb2b27b4b16852640ae067314ac0f22f 100644
--- a/appengine/gaeauth/server/default.go
+++ b/appengine/gaeauth/server/default.go
@@ -1,49 +1,45 @@
 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package server
 
 import (
 	"runtime"
 	"strings"
 
-	"github.com/julienschmidt/httprouter"
 	"golang.org/x/net/context"
 	"google.golang.org/appengine"
 
 	gae_info "github.com/luci/gae/service/info"
 	"github.com/luci/luci-go/server/auth"
 	"github.com/luci/luci-go/server/auth/info"
 	"github.com/luci/luci-go/server/auth/openid"
 	"github.com/luci/luci-go/server/auth/signing"
-	"github.com/luci/luci-go/server/middleware"
+	"github.com/luci/luci-go/server/router"
 
 	"github.com/luci/luci-go/appengine/gaeauth/server/internal/authdb"
 )
 
 // CookieAuth is default cookie-based auth method to use on GAE.
 //
 // On dev server it is based on dev server cookies, in prod it is based on
 // OpenID. Works only if appropriate handlers have been installed into
 // the router. See InstallHandlers.
 var CookieAuth auth.Method
 
-// InstallWebHandlers installs HTTP handlers for various default routes related
+// InstallHandlers installs HTTP handlers for various default routes related
 // to authentication system.
 //
 // Must be installed in server HTTP router for authentication to work.
-//
-// TODO(vadimsh): Rename to InstallHandlers after June 1 2016. It was renamed
-// to purposely break code that called it (since its semantics has changed).
-func InstallWebHandlers(r *httprouter.Router, base middleware.Base) {
+func InstallHandlers(r *router.Router, base router.MiddlewareChain) {
 	m := CookieAuth.(cookieAuthMethod)
 	if oid, ok := m.Method.(*openid.AuthMethod); ok {
 		oid.InstallHandlers(r, base)
 	}
 	auth.InstallHandlers(r, base)
 	authdb.InstallHandlers(r, base)
 	info.InstallHandlers(r, base, getServiceInfo)
 	signing.InstallHandlers(r, base)
 }