import context from standard package

auth/auth.go

@@ -16,6 +16,7 @@
 package auth
 
 import (
+	"context"
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/json"
@@ -25,7 +26,6 @@ import (
 	"strings"
 
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/transport"
 )

auth/auth_appengine.go

@@ -17,7 +17,7 @@
 package auth
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"google.golang.org/appengine"
 )

auth/auth_std.go

@@ -16,7 +16,7 @@
 
 package auth
 
-import "golang.org/x/net/context"
+import "context"
 
 func newSigner(ctx context.Context) (signer, error) {
 	return serviceAcctSigner{}, nil

auth/auth_test.go

@@ -15,6 +15,7 @@
 package auth
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -25,7 +26,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2/google"
 
 	"google.golang.org/api/option"

auth/user_mgt.go

@@ -15,6 +15,7 @@
 package auth
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -23,7 +24,6 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/iterator"
 )

auth/user_mgt_test.go

@@ -16,6 +16,7 @@ package auth
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -28,7 +29,6 @@ import (
 
 	"firebase.google.com/go/internal"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"google.golang.org/api/identitytoolkit/v3"
 	"google.golang.org/api/iterator"

firebase.go

@@ -18,6 +18,7 @@
 package firebase
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
@@ -31,7 +32,6 @@ import (
 	"firebase.google.com/go/messaging"
 	"firebase.google.com/go/storage"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/option"
 	"google.golang.org/api/transport"

firebase_test.go

@@ -15,6 +15,7 @@
 package firebase
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -32,7 +33,6 @@ import (
 
 	"encoding/json"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"google.golang.org/api/option"
 )

iid/iid.go

@@ -16,15 +16,14 @@
 package iid
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
 
 	"google.golang.org/api/transport"
 
 	"firebase.google.com/go/internal"
-
-	"golang.org/x/net/context"
 )
 
 const iidEndpoint = "https://console.firebase.google.com/v1"

iid/iid_test.go

@@ -15,6 +15,7 @@
 package iid
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -23,8 +24,6 @@ import (
 	"google.golang.org/api/option"
 
 	"firebase.google.com/go/internal"
-
-	"golang.org/x/net/context"
 )
 
 var testIIDConfig = &internal.InstanceIDConfig{

integration/auth/auth_test.go

@@ -17,6 +17,7 @@ package auth
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -29,8 +30,6 @@ import (
 
 	"firebase.google.com/go/auth"
 	"firebase.google.com/go/integration/internal"
-
-	"golang.org/x/net/context"
 )
 
 const apiURL = "https://www.googleapis.com/identitytoolkit/v3/relyingparty/verifyCustomToken?key=%s"

integration/auth/user_mgt_test.go

@@ -16,6 +16,7 @@
 package auth
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"testing"
@@ -24,8 +25,6 @@ import (
 	"google.golang.org/api/iterator"
 
 	"firebase.google.com/go/auth"
-
-	"golang.org/x/net/context"
 )
 
 var testFixtures = struct {

integration/firestore/firestore_test.go

@@ -15,13 +15,12 @@
 package firestore
 
 import (
+	"context"
 	"log"
 	"reflect"
 	"testing"
 
 	"firebase.google.com/go/integration/internal"
-
-	"golang.org/x/net/context"
 )
 
 func TestFirestore(t *testing.T) {

integration/iid/iid_test.go

@@ -16,15 +16,14 @@
 package iid
 
 import (
+	"context"
 	"flag"
 	"log"
 	"os"
 	"testing"
 
 	"firebase.google.com/go/iid"
 	"firebase.google.com/go/integration/internal"
-
-	"golang.org/x/net/context"
 )
 
 var client *iid.Client

integration/internal/internal.go

@@ -16,14 +16,13 @@
 package internal
 
 import (
+	"context"
 	"encoding/json"
 	"go/build"
 	"io/ioutil"
 	"path/filepath"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	firebase "firebase.google.com/go"
 	"google.golang.org/api/option"
 )

integration/messaging/messaging_test.go

@@ -15,14 +15,13 @@
 package messaging
 
 import (
+	"context"
 	"flag"
 	"log"
 	"os"
 	"regexp"
 	"testing"
 
-	"golang.org/x/net/context"
-
 	"firebase.google.com/go/integration/internal"
 	"firebase.google.com/go/messaging"
 )

integration/storage/storage_test.go

@@ -15,6 +15,7 @@
 package storage
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -25,7 +26,6 @@ import (
 	gcs "cloud.google.com/go/storage"
 	"firebase.google.com/go/integration/internal"
 	"firebase.google.com/go/storage"
-	"golang.org/x/net/context"
 )
 
 var ctx context.Context

internal/http_client.go

@@ -16,13 +16,12 @@ package internal
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 // HTTPClient is a convenient API to make HTTP calls.

internal/http_client_test.go

@@ -14,14 +14,13 @@
 package internal
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 var cases = []struct {

messaging/messaging.go

@@ -17,6 +17,7 @@
 package messaging
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -25,8 +26,6 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"firebase.google.com/go/internal"
 	"google.golang.org/api/transport"
 )

messaging/messaging_test.go

@@ -15,6 +15,7 @@
 package messaging
 
 import (
+	"context"
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
@@ -25,7 +26,6 @@ import (
 	"time"
 
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 	"google.golang.org/api/option"
 )
 

snippets/auth.go

@@ -15,11 +15,11 @@
 package snippets
 
 import (
+	"context"
 	"log"
 
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/auth"
-	"golang.org/x/net/context"
 	"google.golang.org/api/iterator"
 )
 

snippets/messaging.go

@@ -15,13 +15,13 @@
 package snippets
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"time"
 
 	"firebase.google.com/go"
 	"firebase.google.com/go/messaging"
-	"golang.org/x/net/context"
 )
 
 func sendToToken(app *firebase.App) {

storage/storage.go

@@ -16,12 +16,11 @@
 package storage
 
 import (
+	"context"
 	"errors"
 
 	"cloud.google.com/go/storage"
 	"firebase.google.com/go/internal"
-
-	"golang.org/x/net/context"
 )
 
 // Client is the interface for the Firebase Storage service.

storage/storage_test.go

@@ -15,12 +15,12 @@
 package storage
 
 import (
+	"context"
 	"testing"
 
 	"google.golang.org/api/option"
 
 	"firebase.google.com/go/internal"
-	"golang.org/x/net/context"
 )
 
 var opts = []option.ClientOption{