Refactor a bit.

impl/prod/info.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 prod
 
 import (
         "time"
 
-        "github.com/luci/gae"
+        "github.com/luci/gae/service/info"
         "golang.org/x/net/context"
         "google.golang.org/appengine"
 )
 
 // useGI adds a gae.GlobalInfo implementation to context, accessible
 // by gae.GetGI(c)
 func useGI(c context.Context) context.Context {
-        return gae.SetGIFactory(c, func(ci context.Context) gae.GlobalInfo {
+        return info.SetFactory(c, func(ci context.Context) info.Interface {
                 return giImpl{ci}
         })
 }
 
 type giImpl struct{ context.Context }
 
 func (g giImpl) AccessToken(scopes ...string) (token string, expiry time.Time, err error) {
         return appengine.AccessToken(g, scopes...)
 }
 func (g giImpl) AppID() string {
@@ skipping 19 matching lines @@
 }
 func (g giImpl) ModuleHostname(module, version, instance string) (string, error) {
         return appengine.ModuleHostname(g, module, version, instance)
 }
 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) {
+func (g giImpl) PublicCertificates() ([]info.Certificate, error) {
         certs, err := appengine.PublicCertificates(g)
         if err != nil {
                 return nil, err
         }
-        ret := make([]gae.GICertificate, len(certs))
+        ret := make([]info.Certificate, len(certs))
         for i, c := range certs {
-                ret[i] = (gae.GICertificate)(c)
+                ret[i] = info.Certificate(c)
         }
         return ret, nil
 }
 func (g giImpl) RequestID() string {
         return appengine.RequestID(g)
 }
 func (g giImpl) ServerSoftware() string {
         return appengine.ServerSoftware()
 }
 func (g giImpl) ServiceAccount() (string, error) {
         return appengine.ServiceAccount(g)
 }
 func (g giImpl) SignBytes(bytes []byte) (keyName string, signature []byte, err error) {
         return appengine.SignBytes(g, bytes)
 }
 func (g giImpl) VersionID() string {
         return appengine.VersionID(g)
 }