Replace "golang.org/x/net/context" with "context" and stop supporting go1.6

.travis.yml

@@ -1,7 +1,6 @@
 language: go
 
 go:
-  - 1.6.3
   - 1.7
   - 1.8
 

Documentation/server-reflection-tutorial.md

@@ -16,7 +16,7 @@ For example, to enable server reflection in `example/helloworld`, we need to mak
 --- a/examples/helloworld/greeter_server/main.go
 +++ b/examples/helloworld/greeter_server/main.go
 @@ -40,6 +40,7 @@ import (
-        "golang.org/x/net/context"
+        "context"
         "google.golang.org/grpc"
         pb "google.golang.org/grpc/examples/helloworld/helloworld"
 +       "google.golang.org/grpc/reflection"

balancer.go

@@ -34,10 +34,10 @@
 package grpc
 
 import (
+	"context"
 	"fmt"
 	"sync"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"

balancer_test.go

@@ -34,13 +34,13 @@
 package grpc
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"sync"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/naming"
 )

benchmark/benchmark.go

@@ -37,11 +37,11 @@ Package benchmark implements the building blocks to setup end-to-end gRPC benchm
 package benchmark
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
 	"google.golang.org/grpc/grpclog"

benchmark/benchmark_test.go

@@ -1,12 +1,12 @@
 package benchmark
 
 import (
+	"context"
 	"os"
 	"sync"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
 	"google.golang.org/grpc/benchmark/stats"

benchmark/client/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"math"
 	"net"
@@ -9,7 +10,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/benchmark"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"

benchmark/worker/benchmark_client.go

@@ -34,12 +34,12 @@
 package main
 
 import (
+	"context"
 	"math"
 	"runtime"
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/benchmark"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"

benchmark/worker/main.go

@@ -34,6 +34,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
@@ -42,7 +43,6 @@ import (
 	"strconv"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
 	"google.golang.org/grpc/codes"

call.go

@@ -35,10 +35,10 @@ package grpc
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/peer"

call_test.go

@@ -34,6 +34,7 @@
 package grpc
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"math"
@@ -44,7 +45,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/transport"
 )

clientconn.go

@@ -34,14 +34,14 @@
 package grpc
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"math"
 	"net"
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"

clientconn_test.go

@@ -34,12 +34,11 @@
 package grpc
 
 import (
+	"context"
 	"net"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"google.golang.org/grpc/credentials"
 )
 

credentials/credentials.go

@@ -38,15 +38,14 @@
 package credentials // import "google.golang.org/grpc/credentials"
 
 import (
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 var (

credentials/credentials_test.go

@@ -34,11 +34,10 @@
 package credentials
 
 import (
+	"context"
 	"crypto/tls"
 	"net"
 	"testing"
-
-	"golang.org/x/net/context"
 )
 
 func TestTLSOverrideServerName(t *testing.T) {

credentials/oauth/oauth.go

@@ -35,10 +35,10 @@
 package oauth
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"

examples/helloworld/greeter_client/main.go

@@ -34,10 +34,10 @@
 package main
 
 import (
+	"context"
 	"log"
 	"os"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 )

examples/helloworld/greeter_server/main.go

@@ -34,10 +34,10 @@
 package main
 
 import (
+	"context"
 	"log"
 	"net"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 	"google.golang.org/grpc/reflection"

examples/helloworld/mock/hw_test.go

@@ -1,12 +1,12 @@
 package mock_test
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	helloworld "google.golang.org/grpc/examples/helloworld/helloworld"
 	hwmock "google.golang.org/grpc/examples/helloworld/mock/mock_helloworld"
 )

examples/helloworld/mock/mock_helloworld/hw_mock.go

@@ -4,8 +4,9 @@
 package mock_helloworld
 
 import (
+	context "context"
+
 	gomock "github.com/golang/mock/gomock"
-	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 	helloworld "google.golang.org/grpc/examples/helloworld/helloworld"
 )

examples/route_guide/client/client.go

@@ -38,12 +38,12 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"io"
 	"math/rand"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	pb "google.golang.org/grpc/examples/route_guide/routeguide"

examples/route_guide/server/server.go

@@ -38,6 +38,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -47,7 +48,6 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	"google.golang.org/grpc/credentials"