Require an explicit ServiceName annotation for interfaces in Python.

mojo/public/python/mojo_application/service_provider_impl.py

Index: mojo/public/python/mojo_application/service_provider_impl.py
diff --git a/mojo/public/python/mojo_application/service_provider_impl.py b/mojo/public/python/mojo_application/service_provider_impl.py
index 0166c766d37e5f99655e5a3cf1b07d8d331ea730..b804c487fc4501cb3dbb319e8cececd8eb7b457f 100644
--- a/mojo/public/python/mojo_application/service_provider_impl.py
+++ b/mojo/public/python/mojo_application/service_provider_impl.py
@@ -13,8 +13,13 @@ class ServiceProviderImpl(service_provider_mojom.ServiceProvider):
     self._provider = provider
     self._name_to_service_connector = {}
 
-  def AddService(self, service_class):
-    self._name_to_service_connector[service_class.manager.name] = service_class
+  def AddService(self, service_class, service_name=None):
+    if service_name is None:
+      service_name = service_class.service_name
+    if service_name is None:
+      logging.error("No ServiceName specified for %s." % service_class.__name__)
+      return
+    self._name_to_service_connector[service_name] = service_class
 
   def ConnectToService(self, interface_name, pipe):
     if interface_name in self._name_to_service_connector: