Reland: Refactor current GAE abstraction library to be free of the SDK*

go/src/infra/gae/libs/memlock/memlock_test.go

Index: go/src/infra/gae/libs/memlock/memlock_test.go
diff --git a/go/src/infra/gae/libs/memlock/memlock_test.go b/go/src/infra/gae/libs/memlock/memlock_test.go
index 6d86249507ea8ca3316bb2f45f7af8e1362e5b83..ab4fecac94b38a8135e614c80362bef8e7af8b6b 100644
--- a/go/src/infra/gae/libs/memlock/memlock_test.go
+++ b/go/src/infra/gae/libs/memlock/memlock_test.go
@@ -6,18 +6,17 @@ package memlock
 
 import (
 	"fmt"
-	"infra/gae/libs/wrapper"
-	"infra/gae/libs/wrapper/memory"
-	"infra/libs/clock"
-	"infra/libs/clock/testclock"
 	"runtime"
 	"testing"
 	"time"
 
+	"infra/gae/libs/gae"
+	"infra/gae/libs/gae/memory"
+
+	"github.com/luci/luci-go/common/clock"
+	"github.com/luci/luci-go/common/clock/testclock"
 	. "github.com/smartystreets/goconvey/convey"
 	"golang.org/x/net/context"
-
-	"appengine/memcache"
 )
 
 func init() {
@@ -42,9 +41,9 @@ func TestSimple(t *testing.T) {
 			}
 		})
 		ctx = memory.Use(ctx)
-		mc := wrapper.GetMC(ctx).(interface {
-			wrapper.Testable
-			wrapper.MCSingleReadWriter
+		mc := gae.GetMC(ctx).(interface {
+			gae.Testable
+			gae.Memcache
 		})
 
 		Convey("fails to acquire when memcache is down", func() {
@@ -105,7 +104,7 @@ func TestSimple(t *testing.T) {
 					})
 
 					Convey("or because it was stolen", func() {
-						mc.Set(&memcache.Item{Key: key, Value: []byte("wat")})
+						mc.Set(mc.NewItem(key).SetValue([]byte("wat")))
 						waitFalse()
 					})