Mojo: split up service_provider.mojom

mojo/shell/shell_test_helper.h

Index: mojo/shell/shell_test_helper.h
diff --git a/mojo/shell/shell_test_helper.h b/mojo/shell/shell_test_helper.h
index d6753731697c06cc803459f5e68cd32d6bcaa315..e83bf2640d09dd49ab6425126be939bc4984d1c2 100644
--- a/mojo/shell/shell_test_helper.h
+++ b/mojo/shell/shell_test_helper.h
@@ -8,7 +8,6 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/shell/context.h"
 
@@ -21,8 +20,8 @@ class ServiceLoader;
 namespace shell {
 
 // ShellTestHelper is useful for tests to establish a connection to the
-// ServiceProvider. Invoke Init() to establish the connection. Once done,
-// service_provider() returns the handle to the ServiceProvider.
+// ServiceManager. Invoke Init() to establish the connection. Once done,
+// service_manager() returns the ServiceManager.
 class ShellTestHelper {
  public:
   ShellTestHelper();
@@ -30,8 +29,6 @@ class ShellTestHelper {
 
   void Init();
 
-  // Returns a handle to the ServiceManager. ShellTestHelper owns the
-  // ServiceProvider.
   ServiceManager* service_manager() { return context_.service_manager(); }
 
   // Sets a ServiceLoader for the specified URL. |loader| is ultimately used on