Simplify memory package interface.

go/src/infra/gae/libs/wrapper/memory/memcache_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package memory
 
 import (
         "infra/gae/libs/wrapper"
         "infra/gae/libs/wrapper/unsafe"
         "testing"
         "time"
 
         . "github.com/smartystreets/goconvey/convey"
         "golang.org/x/net/context"
 
         "appengine/memcache"
 )
 
 func TestMemcache(t *testing.T) {
         t.Parallel()
 
         Convey("memcache", t, func() {
                 now := time.Now()
                 timeNow := func(context.Context) time.Time {
                         ret := now
                         now = now.Add(time.Second)
                         return ret
                 }
-                c := UseMC(UseGI(wrapper.SetTimeNowFactory(Enable(context.Background()), timeNow)))
+                c := Use(wrapper.SetTimeNowFactory(context.Background(), timeNow))
                 mc := wrapper.GetMC(c)
                 mci := mc.(*memcacheImpl)
 
                 Convey("implements MCSingleReadWriter", func() {
                         Convey("Add", func() {
                                 itm := &memcache.Item{
                                         Key:        "sup",
                                         Value:      []byte("cool"),
                                         Expiration: time.Second,
                                 }
@@ skipping 170 matching lines @@
                         testItem := &memcache.Item{
                                 Key:   "sup",
                                 Value: []byte("cool"),
                         }
                         unsafe.MCSetCasID(testItem, 1)
                         So(el, ShouldResemble, testItem)
                 })
 
         })
 }