Revert "Refactor current GAE abstraction library to be free of the SDK*"

go/src/infra/gae/libs/wrapper/memory/globalinfo.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"
+
         "golang.org/x/net/context"
-
-        "infra/gae/libs/gae"
 )
 
 type giContextKeyType int
 
 var giContextKey giContextKeyType
 
 func curGID(c context.Context) *globalInfoData {
         return c.Value(giContextKey).(*globalInfoData)
 }
 
-// useGI adds a gae.GlobalInfo context, accessible
-// by gae.GetGI(c)
+// useGI adds a wrapper.GlobalInfo context, accessible
+// by wrapper.GetGI(c)
 func useGI(c context.Context) context.Context {
-        return gae.SetGIFactory(c, func(ic context.Context) gae.GlobalInfo {
-                return &giImpl{gae.DummyGI(), curGID(ic), ic}
+        return wrapper.SetGIFactory(c, func(ic context.Context) wrapper.GlobalInfo {
+                return &giImpl{wrapper.DummyGI(), curGID(ic), ic}
         })
 }
 
-// globalAppID is the 'AppID' of everythin returned from this memory
-// implementation (DSKeys, GlobalInfo, etc.). There's no way to modify this
-// value through the API, and there are a couple bits of code where it's hard to
-// route this value through to without making the internal APIs really complex.
-const globalAppID = "dev~app"
-
 type globalInfoData struct{ namespace string }
 
 type giImpl struct {
-        gae.GlobalInfo
+        wrapper.GlobalInfo
         data *globalInfoData
         c    context.Context
 }
 
-var _ = gae.GlobalInfo((*giImpl)(nil))
+var _ = wrapper.GlobalInfo((*giImpl)(nil))
 
 func (gi *giImpl) Namespace(ns string) (context.Context, error) {
         return context.WithValue(gi.c, giContextKey, &globalInfoData{ns}), nil
 }
-
-func (gi *giImpl) AppID() string {
-        return globalAppID
-}