Interface update, per-method Contexts.

filter/count/user.go

 // 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 count
 
 import (
         "github.com/luci/gae/service/user"
         "golang.org/x/net/context"
 )
 
 // UserCounter is the counter object for the User service.
 type UserCounter struct {
         Current           Entry
         CurrentOAuth      Entry
         IsAdmin           Entry
         LoginURL          Entry
         LoginURLFederated Entry
         LogoutURL         Entry
         OAuthConsumerKey  Entry
 }
 
 type userCounter struct {
         c *UserCounter
 
-        u user.Interface
+        u user.RawInterface
 }
 
-var _ user.Interface = (*userCounter)(nil)
+var _ user.RawInterface = (*userCounter)(nil)
 
 func (u *userCounter) Current() *user.User {
         u.c.Current.up()
         return u.u.Current()
 }
 
 func (u *userCounter) CurrentOAuth(scopes ...string) (*user.User, error) {
         ret, err := u.u.CurrentOAuth(scopes...)
         return ret, u.c.CurrentOAuth.up(err)
 }
@@ skipping 16 matching lines @@
 func (u *userCounter) LogoutURL(dest string) (string, error) {
         ret, err := u.u.LogoutURL(dest)
         return ret, u.c.LogoutURL.up(err)
 }
 
 func (u *userCounter) OAuthConsumerKey() (string, error) {
         ret, err := u.u.OAuthConsumerKey()
         return ret, u.c.OAuthConsumerKey.up(err)
 }
 
-func (u *userCounter) Testable() user.Testable {
-        return u.u.Testable()
+func (u *userCounter) GetTestable() user.Testable {
+        return u.u.GetTestable()
 }
 
 // FilterUser installs a counter User filter in the context.
 func FilterUser(c context.Context) (context.Context, *UserCounter) {
         state := &UserCounter{}
-        return user.AddFilters(c, func(ic context.Context, u user.Interface) user.Interface {
+        return user.AddFilters(c, func(ic context.Context, u user.RawInterface) user.RawInterface {
                 return &userCounter{state, u}
         }), state
 }