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

go/src/infra/gae/libs/gae/taskqueue_testable.go

Index: go/src/infra/gae/libs/gae/taskqueue_testable.go
diff --git a/go/src/infra/gae/libs/wrapper/taskqueue_testable.go b/go/src/infra/gae/libs/gae/taskqueue_testable.go
similarity index 63%
rename from go/src/infra/gae/libs/wrapper/taskqueue_testable.go
rename to go/src/infra/gae/libs/gae/taskqueue_testable.go
index cd3f100ab97b84cec325a89231fe88e4d5bf93cc..a863455c5dc5ae8ae805e66130eb61e3b2824cde 100644
--- a/go/src/infra/gae/libs/wrapper/taskqueue_testable.go
+++ b/go/src/infra/gae/libs/gae/taskqueue_testable.go
@@ -2,17 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package wrapper
+package gae
 
-import (
-	"appengine/taskqueue"
-)
+// QueueData is {queueName: {taskName: *TQTask}}
+type QueueData map[string]map[string]*TQTask
 
-// QueueData is {queueName: {taskName: *Task}}
-type QueueData map[string]map[string]*taskqueue.Task
-
-// AnonymousQueueData is {queueName: [*Task]}
-type AnonymousQueueData map[string][]*taskqueue.Task
+// AnonymousQueueData is {queueName: [*TQTask]}
+type AnonymousQueueData map[string][]*TQTask
 
 // TQTestable is the testable interface for fake taskqueue implementations
 type TQTestable interface {