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

go/src/infra/gae/libs/wrapper/gae/globalinfo.go

Index: go/src/infra/gae/libs/wrapper/gae/globalinfo.go
diff --git a/go/src/infra/gae/libs/gae/prod/globalinfo.go b/go/src/infra/gae/libs/wrapper/gae/globalinfo.go
similarity index 69%
rename from go/src/infra/gae/libs/gae/prod/globalinfo.go
rename to go/src/infra/gae/libs/wrapper/gae/globalinfo.go
index a315e1a9daa0bf810221f2d0f78c7f80dd025172..c4988e0976ed7ec23ff5b2bb515b97d70318a17d 100644
--- a/go/src/infra/gae/libs/gae/prod/globalinfo.go
+++ b/go/src/infra/gae/libs/wrapper/gae/globalinfo.go
@@ -2,27 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package prod
+package gae
 
 import (
 	"time"
 
 	"golang.org/x/net/context"
 
-	"infra/gae/libs/gae"
+	"appengine"
 
-	"google.golang.org/appengine"
+	"infra/gae/libs/wrapper"
 )
 
-// useGI adds a gae.GlobalInfo implementation to context, accessible
-// by gae.GetGI(c)
+// useGI adds a wrapper.GlobalInfo implementation to context, accessible
+// by wrapper.GetGI(c)
 func useGI(c context.Context) context.Context {
-	return gae.SetGIFactory(c, func(ci context.Context) gae.GlobalInfo {
-		return giImpl{ci}
+	return wrapper.SetGIFactory(c, func(ci context.Context) wrapper.GlobalInfo {
+		return giImpl{ctx(c).Context, ci}
 	})
 }
 
-type giImpl struct{ context.Context }
+type giImpl struct {
+	appengine.Context
+	ctx context.Context
+}
 
 func (g giImpl) AccessToken(scopes ...string) (token string, expiry time.Time, err error) {
 	return appengine.AccessToken(g, scopes...)
@@ -31,7 +34,7 @@ func (g giImpl) AppID() string {
 	return appengine.AppID(g)
 }
 func (g giImpl) Datacenter() string {
-	return appengine.Datacenter(g)
+	return appengine.Datacenter()
 }
 func (g giImpl) DefaultVersionHostname() string {
 	return appengine.DefaultVersionHostname(g)
@@ -39,7 +42,10 @@ func (g giImpl) DefaultVersionHostname() string {
 func (g giImpl) InstanceID() string {
 	return appengine.InstanceID()
 }
-func (g giImpl) IsDevAppServer() bool {
+func (g giImpl) IsCapabilityDisabled(err error) bool {
+	return appengine.IsCapabilityDisabled(err)
+}
+func (g giImpl) IsDevAppserver() bool {
 	return appengine.IsDevAppServer()
 }
 func (g giImpl) IsOverQuota(err error) bool {
@@ -55,18 +61,14 @@ func (g giImpl) ModuleName() (name string) {
 	return appengine.ModuleName(g)
 }
 func (g giImpl) Namespace(namespace string) (context.Context, error) {
-	return appengine.Namespace(g, namespace)
-}
-func (g giImpl) PublicCertificates() ([]gae.GICertificate, error) {
-	certs, err := appengine.PublicCertificates(g)
+	gaeC, err := appengine.Namespace(g, namespace)
 	if err != nil {
 		return nil, err
 	}
-	ret := make([]gae.GICertificate, len(certs))
-	for i, c := range certs {
-		ret[i] = (gae.GICertificate)(c)
-	}
-	return ret, nil
+	return context.WithValue(g.ctx, goonContextKey, gaeC), nil
+}
+func (g giImpl) PublicCertificates() ([]appengine.Certificate, error) {
+	return appengine.PublicCertificates(g)
 }
 func (g giImpl) RequestID() string {
 	return appengine.RequestID(g)