Update Go sub-repo import paths, add canonical import comments.

https://code.google.com/p/go-wiki/wiki/SubRepositories
http://tip.golang.org/doc/go1.4#canonicalimports

cloud.go

@@ -14,16 +14,16 @@
 
 // Package cloud contains Google Cloud Platform APIs related types
 // and common functions.
-package cloud
+package cloud // import "google.golang.org/cloud"
 
 import (
 	"net/http"
 
 	"google.golang.org/cloud/internal"
 
-	"code.google.com/p/go.net/context"
 	pubsub "code.google.com/p/google-api-go-client/pubsub/v1beta1"
 	storage "code.google.com/p/google-api-go-client/storage/v1"
+	"golang.org/x/net/context"
 )
 
 // NewContext returns a new context that uses the provided http.Client.

datastore/datastore.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package datastore
+package datastore // import "google.golang.org/cloud/datastore"
 
 import (
 	"bytes"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 	"reflect"
 
-	"code.google.com/p/go.net/context"
 	"code.google.com/p/goprotobuf/proto"
+	"golang.org/x/net/context"
 	"google.golang.org/cloud/internal"
 	pb "google.golang.org/cloud/internal/datastore"
 )

datastore/key.go

@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/go.net/context"
 	"code.google.com/p/goprotobuf/proto"
+	"golang.org/x/net/context"
 	"google.golang.org/cloud/internal"
 	pb "google.golang.org/cloud/internal/datastore"
 )

datastore/query.go

@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"strings"
 
-	"code.google.com/p/go.net/context"
 	"code.google.com/p/goprotobuf/proto"
+	"golang.org/x/net/context"
 	pb "google.golang.org/cloud/internal/datastore"
 )
 

datastore/transaction.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"net/http"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 
 	pb "google.golang.org/cloud/internal/datastore"
 )

examples/pubsub/cmdline/main.go

@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"time"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 
 	"github.com/golang/oauth2"
 	"github.com/golang/oauth2/google"

examples/storage/appengine/app.go

@@ -25,7 +25,7 @@ import (
 	"net/http"
 	"strings"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 
 	"appengine"
 	"appengine/file"

examples/storage/appenginevm/app.go

@@ -25,7 +25,7 @@ import (
 	"net/http"
 	"strings"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 
 	"github.com/golang/oauth2"
 	"github.com/golang/oauth2/google"

internal/cloud.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 )
 
 // Key represents a context key. It shouldn't be used by the

pubsub/integration_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/go.net/context"
 	"github.com/golang/oauth2/google"
+	"golang.org/x/net/context"
 	"google.golang.org/cloud"
 )
 

pubsub/pubsub.go

@@ -16,7 +16,7 @@
 //
 // More information about Google Cloud Pub/Sub is available on
 // https://cloud.google.com/pubsub/docs
-package pubsub
+package pubsub // import "google.golang.org/cloud/pubsub"
 
 import (
 	"encoding/base64"
@@ -28,9 +28,9 @@ import (
 
 	"google.golang.org/cloud/internal"
 
-	"code.google.com/p/go.net/context"
 	"code.google.com/p/google-api-go-client/googleapi"
 	raw "code.google.com/p/google-api-go-client/pubsub/v1beta1"
+	"golang.org/x/net/context"
 )
 
 var (

storage/acl.go

@@ -17,8 +17,8 @@ package storage
 import (
 	"fmt"
 
-	"code.google.com/p/go.net/context"
 	raw "code.google.com/p/google-api-go-client/storage/v1"
+	"golang.org/x/net/context"
 )
 
 // ACLRole is the the access permission for the entity.

storage/integration_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/golang/oauth2/google"
 	"google.golang.org/cloud"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 )
 
 var (

storage/storage.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Package storage is a Google Cloud Storage client.
-package storage
+package storage // import "google.golang.org/cloud/storage"
 
 import (
 	"errors"
@@ -23,9 +23,9 @@ import (
 
 	"google.golang.org/cloud/internal"
 
-	"code.google.com/p/go.net/context"
 	"code.google.com/p/google-api-go-client/googleapi"
 	raw "code.google.com/p/google-api-go-client/storage/v1"
+	"golang.org/x/net/context"
 )
 
 var (

storage/types.go

@@ -18,8 +18,8 @@ import (
 	"io"
 	"time"
 
-	"code.google.com/p/go.net/context"
 	raw "code.google.com/p/google-api-go-client/storage/v1"
+	"golang.org/x/net/context"
 )
 
 // Owner represents the owner of a GCS object.