TBR wspr: Rename vom.NewBinaryEncoder to vom.NewEncoder

MultiPart: 2/3
Change-Id: I6d3400b346f834779d59753fe72631e0427aeb88
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 9ce62b4..f7a13ad 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -320,7 +320,7 @@
 
 func makeRequest(rpc VeyronRPCRequest, args ...interface{}) (string, error) {
 	var buf bytes.Buffer
-	encoder, err := vom.NewBinaryEncoder(&buf)
+	encoder, err := vom.NewEncoder(&buf)
 	if err != nil {
 		return "", err
 	}
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index 198a636..71f4c7e 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -141,7 +141,7 @@
 // TODO(bprosnitz) Don't double-encode
 func ConstructOutgoingMessage(messageId int32, messageType lib.ResponseType, data interface{}) (string, error) {
 	var buf bytes.Buffer
-	enc, err := vom.NewBinaryEncoder(&buf)
+	enc, err := vom.NewEncoder(&buf)
 	if err != nil {
 		return "", err
 	}
@@ -150,7 +150,7 @@
 	}
 
 	var buf2 bytes.Buffer
-	enc2, err := vom.NewBinaryEncoder(&buf2)
+	enc2, err := vom.NewEncoder(&buf2)
 	if err != nil {
 		return "", err
 	}
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index a55f521..23da685 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -186,7 +186,7 @@
 	}
 
 	var buf bytes.Buffer
-	encoder, err := vom.NewBinaryEncoder(&buf)
+	encoder, err := vom.NewEncoder(&buf)
 	if err != nil {
 		t.Fatalf("Failed to vom encode rpc message: %v", err)
 	}
diff --git a/services/wsprd/channel/channel_nacl/channel_nacl.go b/services/wsprd/channel/channel_nacl/channel_nacl.go
index f77de0b..ea51559 100644
--- a/services/wsprd/channel/channel_nacl/channel_nacl.go
+++ b/services/wsprd/channel/channel_nacl/channel_nacl.go
@@ -17,7 +17,7 @@
 
 func sendMessageToBrowser(ppapiInst ppapi.Instance, m channel.Message) {
 	var outBuf bytes.Buffer
-	enc, err := vom.NewBinaryEncoder(&outBuf)
+	enc, err := vom.NewEncoder(&outBuf)
 	if err != nil {
 		panic(fmt.Sprintf("Error beginning encoding: %v", err))
 	}
diff --git a/services/wsprd/lib/vom.go b/services/wsprd/lib/vom.go
index 379f28a..dd40103 100644
--- a/services/wsprd/lib/vom.go
+++ b/services/wsprd/lib/vom.go
@@ -9,7 +9,7 @@
 
 func VomEncode(v interface{}) (string, error) {
 	var buf bytes.Buffer
-	encoder, err := vom.NewBinaryEncoder(&buf)
+	encoder, err := vom.NewEncoder(&buf)
 	if err != nil {
 		return "", err
 	}
diff --git a/services/wsprd/principal/principal.go b/services/wsprd/principal/principal.go
index 9699e78..6fc336c 100644
--- a/services/wsprd/principal/principal.go
+++ b/services/wsprd/principal/principal.go
@@ -179,7 +179,7 @@
 		return err
 	}
 
-	encoder, err := vom.NewBinaryEncoder(swc)
+	encoder, err := vom.NewEncoder(swc)
 
 	if err != nil {
 		return err
diff --git a/services/wsprd/principal/principal_test.go b/services/wsprd/principal/principal_test.go
index f11f543..081af72 100644
--- a/services/wsprd/principal/principal_test.go
+++ b/services/wsprd/principal/principal_test.go
@@ -61,7 +61,7 @@
 	// Validate the integrity of the bits.
 	buf := new(bytes.Buffer)
 
-	encoder, err := vom.NewBinaryEncoder(buf)
+	encoder, err := vom.NewEncoder(buf)
 
 	if err != nil {
 		return err