Get rid of awkward proto argument to Interface.Run

service/datastore/checkfilter_test.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.
 
 // adapted from github.com/golang/appengine/datastore
 
 package datastore
 
 import (
         "testing"
@@ skipping 31 matching lines @@
                                 }, nil)
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
                 Convey("Run", func() {
                         So(rds.Run(nil, nil).Error(), ShouldContainSubstring, "query is nil")
                         So(rds.Run(rds.NewQuery("sup"), nil).Error(), ShouldContainSubstring, "callback is nil")
                         hit := false
                         So(func() {
-                                rds.Run(rds.NewQuery("sup"), func(Key, PropertyMap, func() (Cursor, error)) bool {
+                                rds.Run(rds.NewQuery("sup"), func(Key, PropertyMap, CursorCB) bool {
                                         hit = true
                                         return true
                                 })
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
                 Convey("GetMulti", func() {
                         So(rds.GetMulti(nil, nil, nil), ShouldBeNil)
                         So(rds.GetMulti([]Key{NewKey("", "", "", "", 0, nil)}, nil, nil).Error(), ShouldContainSubstring, "is nil")
@@ skipping 59 matching lines @@
                         So(func() {
                                 rds.DeleteMulti([]Key{NewKey("aid", "ns", "Kind", "", 1, nil)}, func(error) {
                                         hit = true
                                 })
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
         })
 }