From ec56c3bddaa576f46b2420ed7d9e30f17196327e Mon Sep 17 00:00:00 2001
From: Dmitry Savintsev <dsavints@yahoo-inc.com>
Date: Tue, 10 Oct 2017 13:40:08 +0200
Subject: [PATCH] use context package from stdlib

---
 examples/route_guide/client/client.go                | 2 +-
 examples/route_guide/mock_routeguide/rg_mock.go      | 3 ++-
 examples/route_guide/mock_routeguide/rg_mock_test.go | 2 +-
 examples/route_guide/routeguide/route_guide.pb.go    | 3 ++-
 examples/route_guide/server/server.go                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/route_guide/client/client.go b/examples/route_guide/client/client.go
index 6fc7a079c51f..d47772f7e20b 100644
--- a/examples/route_guide/client/client.go
+++ b/examples/route_guide/client/client.go
@@ -23,13 +23,13 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"io"
 	"log"
 	"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"
diff --git a/examples/route_guide/mock_routeguide/rg_mock.go b/examples/route_guide/mock_routeguide/rg_mock.go
index 328c929fa8e4..15952577f6c8 100644
--- a/examples/route_guide/mock_routeguide/rg_mock.go
+++ b/examples/route_guide/mock_routeguide/rg_mock.go
@@ -4,8 +4,9 @@
 package mock_routeguide
 
 import (
+	"context"
+
 	gomock "github.com/golang/mock/gomock"
-	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 	routeguide "google.golang.org/grpc/examples/route_guide/routeguide"
 	metadata "google.golang.org/grpc/metadata"
diff --git a/examples/route_guide/mock_routeguide/rg_mock_test.go b/examples/route_guide/mock_routeguide/rg_mock_test.go
index 8c6d63c72e7c..51f890302823 100644
--- a/examples/route_guide/mock_routeguide/rg_mock_test.go
+++ b/examples/route_guide/mock_routeguide/rg_mock_test.go
@@ -19,12 +19,12 @@
 package mock_routeguide_test
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
 	rgmock "google.golang.org/grpc/examples/route_guide/mock_routeguide"
 	rgpb "google.golang.org/grpc/examples/route_guide/routeguide"
 )
diff --git a/examples/route_guide/routeguide/route_guide.pb.go b/examples/route_guide/routeguide/route_guide.pb.go
index cf7f3937e118..c211ac807873 100644
--- a/examples/route_guide/routeguide/route_guide.pb.go
+++ b/examples/route_guide/routeguide/route_guide.pb.go
@@ -21,7 +21,8 @@ import fmt "fmt"
 import math "math"
 
 import (
-	context "golang.org/x/net/context"
+	"context"
+
 	grpc "google.golang.org/grpc"
 )
 
diff --git a/examples/route_guide/server/server.go b/examples/route_guide/server/server.go
index 5d919047ecdb..1920782a8863 100644
--- a/examples/route_guide/server/server.go
+++ b/examples/route_guide/server/server.go
@@ -25,6 +25,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -35,7 +36,6 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	"google.golang.org/grpc/credentials"