Handle interfaces with a ServiceName in the go bindings generator.

mojom/generators/go/templates/interfaces.go

Index: mojom/generators/go/templates/interfaces.go
diff --git a/mojom/generators/go/templates/interfaces.go b/mojom/generators/go/templates/interfaces.go
index ed95d5f49d15b2698ad3c146f22841ac037427a1..4634650f0bec5ee4f0e496ef28c9c56fee4ad28d 100644
--- a/mojom/generators/go/templates/interfaces.go
+++ b/mojom/generators/go/templates/interfaces.go
@@ -12,6 +12,14 @@ const interfaceTmplText = `
 {{- define "Interface" -}}
 {{$interface := . -}}
 {{ template "InterfaceDecl" $interface }}
+
+{{- range $method := $interface.Methods -}}
+{{ template "Method" $method }}
+{{- end -}}
+
+{{- if $interface.ServiceName -}}
+{{ template "ServiceDecl" $interface }}
+{{- end -}}
 {{- end -}}
 `
 
@@ -87,6 +95,18 @@ func (p *{{$interface.Name}}_Proxy) Close_Proxy() {
 {{- end -}}
 `
 
+const methodTmplText = `
+{{- define "Method" -}}
+{{- $method := . -}}
+
+{{ template "MethodParams" $method }}
+
+{{ template "MethodSignature" $method }}
+
+{{ template "MethodFunction" $method }}
+{{- end -}}
+`
+
 const methodOrdinalsTmplText = `
 {{- define "MethodOrdinals" -}}
 {{- $interface := . -}}
@@ -184,12 +204,34 @@ func (p *{{$method.Interface.Name}}_Proxy) {{ template "MethodSignature" $method
 {{- end -}}
 `
 
+const serviceDeclTmplText = `
+{{- define "ServiceDecl" -}}
+{{- $interface := . -}}
+const {{$interface.PrivateName}}_Name string = "{{$interface.ServiceName}}"
+
+func (r *{{$interface.Name}}_Request) Name() string {
+	return {{$interface.PrivateName}}_Name
+}
+
+func (p *{{$interface.Name}}_Pointer) Name() string {
+	return {{$interface.PrivateName}}_Name
+}
+
+func (f *{{$interface.Name}}_ServiceFactory) Name() string {
+	return {{$interface.PrivateName}}_Name
+}
+{{- end -}}
+`
+
 func initInterfaceTemplates() {
+	template.Must(goFileTmpl.Parse(interfaceTmplText))
 	template.Must(goFileTmpl.Parse(interfaceDeclTmplText))
 	template.Must(goFileTmpl.Parse(interfaceInterfaceDeclTmplText))
 	template.Must(goFileTmpl.Parse(interfaceOtherDeclTmplText))
+	template.Must(goFileTmpl.Parse(serviceDeclTmplText))
 	template.Must(goFileTmpl.Parse(methodOrdinalsTmplText))
 	template.Must(goFileTmpl.Parse(methodParamsTmplText))
 	template.Must(goFileTmpl.Parse(methodSignatureTmplText))
 	template.Must(goFileTmpl.Parse(methodFuncTmplText))
+	template.Must(goFileTmpl.Parse(methodTmplText))
 }