Interface update, per-method Contexts.

filter/count/mail.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/mail"
         "golang.org/x/net/context"
 )
 
 // MailCounter is the counter object for the Mail service.
 type MailCounter struct {
         Send         Entry
         SendToAdmins Entry
 }
 
 type mailCounter struct {
         c *MailCounter
 
-        m mail.Interface
+        m mail.RawInterface
 }
 
-var _ mail.Interface = (*mailCounter)(nil)
+var _ mail.RawInterface = (*mailCounter)(nil)
 
 func (m *mailCounter) Send(msg *mail.Message) error {
         return m.c.Send.up(m.m.Send(msg))
 }
 
 func (m *mailCounter) SendToAdmins(msg *mail.Message) error {
         return m.c.SendToAdmins.up(m.m.SendToAdmins(msg))
 }
 
-func (m *mailCounter) Testable() mail.Testable {
-        return m.m.Testable()
+func (m *mailCounter) GetTestable() mail.Testable {
+        return m.m.GetTestable()
 }
 
 // FilterMail installs a counter Mail filter in the context.
 func FilterMail(c context.Context) (context.Context, *MailCounter) {
         state := &MailCounter{}
-        return mail.AddFilters(c, func(ic context.Context, u mail.Interface) mail.Interface {
+        return mail.AddFilters(c, func(ic context.Context, u mail.RawInterface) mail.RawInterface {
                 return &mailCounter{state, u}
         }), state
 }