cmd/pprof: move cmd/internal/pprof back to cmd/pprof/internal

CL 21870 moved the entire cmd/pprof/internal directory to cmd/internal/pprof
for use by cmd/trace, but really cmd/trace only needed cmd/pprof/internal/profile,
which became cmd/internal/pprof/profile, and then internal/pprof/profile.

Move the rest back under cmd/pprof so that it is clear that no other code
is reaching into the guts of cmd/pprof. Just like functions should not be
exported unless necessary, internals should not be made visible to more
code than necessary.

Raúl Silvera noted after the commit of CL 21870 that only the profile package
should have moved, but there was no followup fix (until now).

Change-Id: I603f4dcb0616df1e5d5eb7372e6fccda57e05079
Reviewed-on: https://go-review.googlesource.com/32453
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

src/cmd/pprof/internal/commands/commands.go

@@ -16,10 +16,10 @@ import (
 	"time"
 
 	"cmd/internal/browser"
-	"cmd/internal/pprof/plugin"
-	"cmd/internal/pprof/report"
-	"cmd/internal/pprof/svg"
-	"cmd/internal/pprof/tempfile"
+	"cmd/pprof/internal/plugin"
+	"cmd/pprof/internal/report"
+	"cmd/pprof/internal/svg"
+	"cmd/pprof/internal/tempfile"
 )
 
 // Commands describes the commands accepted by pprof.

src/cmd/pprof/internal/driver/driver.go

@@ -21,10 +21,10 @@ import (
 	"sync"
 	"time"
 
-	"cmd/internal/pprof/commands"
-	"cmd/internal/pprof/plugin"
-	"cmd/internal/pprof/report"
-	"cmd/internal/pprof/tempfile"
+	"cmd/pprof/internal/commands"
+	"cmd/pprof/internal/plugin"
+	"cmd/pprof/internal/report"
+	"cmd/pprof/internal/tempfile"
 	"internal/pprof/profile"
 )
 

src/cmd/pprof/internal/driver/interactive.go

@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"cmd/internal/pprof/commands"
-	"cmd/internal/pprof/plugin"
+	"cmd/pprof/internal/commands"
+	"cmd/pprof/internal/plugin"
 	"internal/pprof/profile"
 )
 

src/cmd/pprof/internal/fetch/fetch.go

@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	"cmd/internal/pprof/plugin"
+	"cmd/pprof/internal/plugin"
 	"internal/pprof/profile"
 )
 

src/cmd/pprof/internal/report/report.go

@@ -17,7 +17,7 @@ import (
 	"strings"
 	"time"
 
-	"cmd/internal/pprof/plugin"
+	"cmd/pprof/internal/plugin"
 	"internal/pprof/profile"
 )
 

src/cmd/pprof/internal/report/source.go

@@ -18,7 +18,7 @@ import (
 	"strconv"
 	"strings"
 
-	"cmd/internal/pprof/plugin"
+	"cmd/pprof/internal/plugin"
 )
 
 // printSource prints an annotated source listing, include all

src/cmd/pprof/internal/symbolizer/symbolizer.go

@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"cmd/internal/pprof/plugin"
+	"cmd/pprof/internal/plugin"
 	"internal/pprof/profile"
 )
 

src/cmd/pprof/pprof.go

@@ -15,12 +15,12 @@ import (
 	"sync"
 
 	"cmd/internal/objfile"
-	"cmd/internal/pprof/commands"
-	"cmd/internal/pprof/driver"
-	"cmd/internal/pprof/fetch"
-	"cmd/internal/pprof/plugin"
-	"cmd/internal/pprof/symbolizer"
-	"cmd/internal/pprof/symbolz"
+	"cmd/pprof/internal/commands"
+	"cmd/pprof/internal/driver"
+	"cmd/pprof/internal/fetch"
+	"cmd/pprof/internal/plugin"
+	"cmd/pprof/internal/symbolizer"
+	"cmd/pprof/internal/symbolz"
 	"internal/pprof/profile"
 )