Remove most error code from luci/gae

impl/prod/taskqueue.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 (
         "fmt"
         "reflect"
 
-        "github.com/luci/gae"
         tq "github.com/luci/gae/service/taskqueue"
+        "github.com/luci/luci-go/common/errors"
         "golang.org/x/net/context"
         "google.golang.org/appengine/taskqueue"
 )
 
 // useTQ adds a gae.TaskQueue implementation to context, accessible
 // by gae.GetTQ(c)
 func useTQ(c context.Context) context.Context {
         return tq.SetFactory(c, func(ci context.Context) tq.Interface {
                 return tqImpl{ci}
         })
@@ skipping 51 matching lines @@
         o.ETA = n.ETA
         o.RetryCount = n.RetryCount
         o.RetryOptions = (*taskqueue.RetryOptions)(n.RetryOptions)
         return &o
 }
 
 // tqMR2FErr (TQ multi-real-to-fake w/ error) converts a slice of
 // *taskqueue.Task to a slice of *tq.Task
 func tqMR2FErr(os []*taskqueue.Task, err error) ([]*tq.Task, error) {
         if err != nil {
-                return nil, gae.FixError(err)
+                return nil, errors.Fix(err)
         }
         ret := make([]*tq.Task, len(os))
         for i, t := range os {
                 ret[i], _ = tqR2FErr(t, nil)
         }
         return ret, nil
 }
 
 // tqMF2R (TQ multi-fake-to-real) converts []*tq.Task to []*taskqueue.Task.
 func tqMF2R(ns []*tq.Task) []*taskqueue.Task {
@@ skipping 12 matching lines @@
 func (t tqImpl) Delete(task *tq.Task, queueName string) error {
         return taskqueue.Delete(t.Context, tqF2R(task), queueName)
 }
 
 //////// TQMultiReadWriter
 
 func (t tqImpl) AddMulti(tasks []*tq.Task, queueName string) ([]*tq.Task, error) {
         return tqMR2FErr(taskqueue.AddMulti(t.Context, tqMF2R(tasks), queueName))
 }
 func (t tqImpl) DeleteMulti(tasks []*tq.Task, queueName string) error {
-        return gae.FixError(taskqueue.DeleteMulti(t.Context, tqMF2R(tasks), queueName))
+        return errors.Fix(taskqueue.DeleteMulti(t.Context, tqMF2R(tasks), queueName))
 }
 
 //////// TQLeaser
 
 func (t tqImpl) Lease(maxTasks int, queueName string, leaseTime int) ([]*tq.Task, error) {
         return tqMR2FErr(taskqueue.Lease(t.Context, maxTasks, queueName, leaseTime))
 }
 func (t tqImpl) LeaseByTag(maxTasks int, queueName string, leaseTime int, tag string) ([]*tq.Task, error) {
         return tqMR2FErr(taskqueue.LeaseByTag(t.Context, maxTasks, queueName, leaseTime, tag))
 }
@@ skipping 13 matching lines @@
         stats, err := taskqueue.QueueStats(t.Context, queueNames)
         if err != nil {
                 return nil, err
         }
         ret := make([]tq.Statistics, len(stats))
         for i, s := range stats {
                 ret[i] = tq.Statistics(s)
         }
         return ret, nil
 }