Fix the service providers to be able to be called more than once.

This was likely a race which caused occasional timeouts.

R=abarth@google.com

sky/shell/linux/platform_service_provider_linux.cc

@@ -7,7 +7,8 @@
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "sky/shell/service_provider.h"
 #include "sky/shell/testing/test_runner.h"
 
@@ -15,13 +16,26 @@ namespace sky {
 namespace shell {
 namespace {
 
-base::LazyInstance<scoped_ptr<mojo::ServiceProviderImpl>> g_service_provider =
-    LAZY_INSTANCE_INITIALIZER;
+class PlatformServiceProvider : public mojo::ServiceProvider {
+ public:
+  PlatformServiceProvider(mojo::InterfaceRequest<mojo::ServiceProvider> request)
+    : binding_(this, request.Pass()) {}
 
-static void CreateServiceProviderImpl(
+  void ConnectToService(const mojo::String& service_name,
+                        mojo::ScopedMessagePipeHandle client_handle) override {
+    if (service_name == TestHarness::Name_) {
+      TestRunner::Shared().Create(nullptr,
+        mojo::MakeRequest<TestHarness>(client_handle.Pass()));
+    }
+  }
+
+ private:
+  mojo::StrongBinding<mojo::ServiceProvider> binding_;
+};
+
+static void CreatePlatformServiceProvider(
     mojo::InterfaceRequest<mojo::ServiceProvider> request) {
-  g_service_provider.Get().reset(new mojo::ServiceProviderImpl(request.Pass()));
-  g_service_provider.Get()->AddService(&TestRunner::Shared());
+  new PlatformServiceProvider(request.Pass());
 }
 
 }  // namespace
@@ -32,7 +46,7 @@ mojo::ServiceProviderPtr CreateServiceProvider(
   mojo::MessagePipe pipe;
   auto request = mojo::MakeRequest<mojo::ServiceProvider>(pipe.handle1.Pass());
   context->platform_task_runner->PostTask(
-      FROM_HERE, base::Bind(CreateServiceProviderImpl, base::Passed(&request)));
+      FROM_HERE, base::Bind(CreatePlatformServiceProvider, base::Passed(&request)));
   return mojo::MakeProxy(
       mojo::InterfacePtrInfo<mojo::ServiceProvider>(pipe.handle0.Pass(), 0u));
 }

sky/shell/mac/platform_service_provider_mac.cc

@@ -21,9 +21,7 @@ namespace shell {
 class PlatformServiceProvider : public mojo::ServiceProvider {
  public:
   PlatformServiceProvider(mojo::InterfaceRequest<mojo::ServiceProvider> request)
-    : binding_(this, request.Pass())
-  {
-  }
+    : binding_(this, request.Pass()) {}
 
   void ConnectToService(const mojo::String& service_name,
                         mojo::ScopedMessagePipeHandle client_handle) override {