Mojo: Unify the disparate source and header files into 3

mojo/public/bindings/sample/sample_service.mojom

Index: mojo/public/bindings/sample/sample_service.mojom
diff --git a/mojo/public/bindings/sample/sample_service.mojom b/mojo/public/bindings/sample/sample_service.mojom
index 44978320732ee72db64576a5e8ef1c24ea94e67a..a2903f35536c79a96431ea56c9a15a9caba0124c 100644
--- a/mojo/public/bindings/sample/sample_service.mojom
+++ b/mojo/public/bindings/sample/sample_service.mojom
@@ -1,5 +1,5 @@
 {
-  'name': 'sample',
+  'name': 'sample_service',
   'namespace': 'sample',
   'structs': [{
     'name': 'Bar',
@@ -7,7 +7,7 @@
       {'name': 'alpha', 'kind': 'u8', 'ordinal': 0},
       {'name': 'beta', 'kind': 'u8', 'ordinal': 1},
       {'name': 'gamma', 'kind': 'u8', 'ordinal': 2}]}, {
-    'name': 'FooBar',
+    'name': 'Foo',
     'fields': [
       {'name': 'name', 'kind': 's', 'ordinal': 8},
       {'name': 'x', 'kind': 'i32', 'ordinal': 0},
@@ -25,7 +25,7 @@
       'name': 'Frobinate',
       'ordinal': 0,
       'parameters': [
-        {'name': 'foo', 'kind': 'x:FooBar', 'ordinal': 0},
+        {'name': 'foo', 'kind': 'x:Foo', 'ordinal': 0},
         {'name': 'baz', 'kind': 'b', 'ordinal': 1},
         {'name': 'port', 'kind': 'h', 'ordinal': 2}]}]}]
 }