Refactor a bit.

filters/count/mc.go

Index: filters/count/mc.go
diff --git a/filters/count/mc.go b/filters/count/mc.go
index d8fd467e9e15d0bdec29feb2d982e733a301a1c8..d65a096c657063f88db745d6012ec26e0053acf5 100644
--- a/filters/count/mc.go
+++ b/filters/count/mc.go
@@ -7,7 +7,7 @@ package count
 import (
 	"golang.org/x/net/context"
 
-	"github.com/luci/gae"
+	mc "github.com/luci/gae/service/memcache"
 )
 
 // MCCounter is the counter object for the Memcache service.
@@ -32,40 +32,40 @@ type MCCounter struct {
 type mcCounter struct {
 	c *MCCounter
 
-	mc gae.Memcache
+	mc mc.Interface
 }
 
-var _ gae.Memcache = (*mcCounter)(nil)
+var _ mc.Interface = (*mcCounter)(nil)
 
-func (m *mcCounter) NewItem(key string) gae.MCItem {
+func (m *mcCounter) NewItem(key string) mc.Item {
 	m.c.NewItem.up()
 	return m.mc.NewItem(key)
 }
 
-func (m *mcCounter) Get(key string) (gae.MCItem, error) {
+func (m *mcCounter) Get(key string) (mc.Item, error) {
 	ret, err := m.mc.Get(key)
 	return ret, m.c.Get.up(err)
 }
 
-func (m *mcCounter) GetMulti(keys []string) (map[string]gae.MCItem, error) {
+func (m *mcCounter) GetMulti(keys []string) (map[string]mc.Item, error) {
 	ret, err := m.mc.GetMulti(keys)
 	return ret, m.c.GetMulti.up(err)
 }
 
-func (m *mcCounter) Add(item gae.MCItem) error { return m.c.Add.up(m.mc.Add(item)) }
-func (m *mcCounter) Set(item gae.MCItem) error { return m.c.Set.up(m.mc.Set(item)) }
-func (m *mcCounter) Delete(key string) error   { return m.c.Delete.up(m.mc.Delete(key)) }
-func (m *mcCounter) CompareAndSwap(item gae.MCItem) error {
+func (m *mcCounter) Add(item mc.Item) error  { return m.c.Add.up(m.mc.Add(item)) }
+func (m *mcCounter) Set(item mc.Item) error  { return m.c.Set.up(m.mc.Set(item)) }
+func (m *mcCounter) Delete(key string) error { return m.c.Delete.up(m.mc.Delete(key)) }
+func (m *mcCounter) CompareAndSwap(item mc.Item) error {
 	return m.c.CompareAndSwap.up(m.mc.CompareAndSwap(item))
 }
-func (m *mcCounter) AddMulti(items []gae.MCItem) error { return m.c.AddMulti.up(m.mc.AddMulti(items)) }
-func (m *mcCounter) SetMulti(items []gae.MCItem) error { return m.c.SetMulti.up(m.mc.SetMulti(items)) }
+func (m *mcCounter) AddMulti(items []mc.Item) error { return m.c.AddMulti.up(m.mc.AddMulti(items)) }
+func (m *mcCounter) SetMulti(items []mc.Item) error { return m.c.SetMulti.up(m.mc.SetMulti(items)) }
 func (m *mcCounter) DeleteMulti(keys []string) error {
 	return m.c.DeleteMulti.up(m.mc.DeleteMulti(keys))
 }
 func (m *mcCounter) Flush() error { return m.c.Flush.up(m.mc.Flush()) }
 
-func (m *mcCounter) CompareAndSwapMulti(items []gae.MCItem) error {
+func (m *mcCounter) CompareAndSwapMulti(items []mc.Item) error {
 	return m.c.CompareAndSwapMulti.up(m.mc.CompareAndSwapMulti(items))
 }
 
@@ -79,7 +79,7 @@ func (m *mcCounter) IncrementExisting(key string, delta int64) (newValue uint64,
 	return ret, m.c.IncrementExisting.up(err)
 }
 
-func (m *mcCounter) Stats() (*gae.MCStatistics, error) {
+func (m *mcCounter) Stats() (*mc.Statistics, error) {
 	ret, err := m.mc.Stats()
 	return ret, m.c.Stats.up(err)
 }
@@ -87,7 +87,7 @@ func (m *mcCounter) Stats() (*gae.MCStatistics, error) {
 // FilterMC installs a counter Memcache filter in the context.
 func FilterMC(c context.Context) (context.Context, *MCCounter) {
 	state := &MCCounter{}
-	return gae.AddMCFilters(c, func(ic context.Context, mc gae.Memcache) gae.Memcache {
+	return mc.AddFilters(c, func(ic context.Context, mc mc.Interface) mc.Interface {
 		return &mcCounter{state, mc}
 	}), state
 }