net/http: use internal/race

Change-Id: Iaa5ded13e8ab4753e2e3d04c9fff203d854208ba
Reviewed-on: https://go-review.googlesource.com/119435
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/net/http/header.go b/src/net/http/header.go
index 461ae9368ac15cc5681813ddb7ba8b92d2a46226..b28144d8c198cdc647870352d2825506e7bd12de 100644 (file)
--- a/src/net/http/header.go
+++ b/src/net/http/header.go
@@ -14,8 +14,6 @@ import (
        "time"
 )
 
-var raceEnabled = false // set by race.go
-
 // A Header represents the key-value pairs in an HTTP header.
 type Header map[string][]string
 

diff --git a/src/net/http/header_test.go b/src/net/http/header_test.go
index bbd35c485a4a3ac333cba522a9921a7becce81f6..48158d313aeba70e7ae591f8f0d33f3dbeb9eaee 100644 (file)
--- a/src/net/http/header_test.go
+++ b/src/net/http/header_test.go
@@ -6,6 +6,7 @@ package http
 
 import (
        "bytes"
+       "internal/race"
        "runtime"
        "testing"
        "time"
@@ -196,7 +197,7 @@ func TestHeaderWriteSubsetAllocs(t *testing.T) {
        if testing.Short() {
                t.Skip("skipping alloc test in short mode")
        }
-       if raceEnabled {
+       if race.Enabled {
                t.Skip("skipping test under race detector")
        }
        if runtime.GOMAXPROCS(0) > 1 {

diff --git a/src/net/http/race.go b/src/net/http/race.go
deleted file mode 100644 (file)
index 7665039..0000000
--- a/src/net/http/race.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build race
-
-package http
-
-func init() {
-       raceEnabled = true
-}