Update APIs to use new Google cloud paths.

client/flagpb/unmarshal_test.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package flagpb
 
 import (
         "io/ioutil"
         "testing"
 
         "github.com/golang/protobuf/proto"
-        "github.com/luci/luci-go/common/proto/google/descriptor"
+        "google.golang.org/genproto/protobuf"
+
+        "github.com/luci/luci-go/common/proto/google/descutil"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 func TestUnmarshal(t *testing.T) {
         t.Parallel()
 
         Convey("Unmarshal", t, func() {
                 descFileBytes, err := ioutil.ReadFile("unmarshal_test.desc")
                 So(err, ShouldBeNil)
 
                 var desc descriptor.FileDescriptorSet
                 err = proto.Unmarshal(descFileBytes, &desc)
                 So(err, ShouldBeNil)
 
                 resolver := NewResolver(&desc)
 
                 resolveMsg := func(name string) *descriptor.DescriptorProto {
-                        _, obj, _ := desc.Resolve("flagpb." + name)
+                        _, obj, _ := descutil.Resolve(&desc, "flagpb."+name)
                         So(obj, ShouldNotBeNil)
                         return obj.(*descriptor.DescriptorProto)
                 }
 
                 unmarshalOK := func(typeName string, args ...string) map[string]interface{} {
                         msg, err := UnmarshalUntyped(args, resolveMsg(typeName), resolver)
                         So(err, ShouldBeNil)
                         return msg
                 }
 
@@ skipping 164 matching lines @@
                                 So(unmarshalOK("MapContainer", "-sm1.x.s", "a", "-sm1.y.s", "b"), ShouldResemble, msg(
                                         "sm1", msg(
                                                 "x", msg("s", "a"),
                                                 "y", msg("s", "b"),
                                         ),
                                 ))
                         })
                 })
         })
 }