Expose NavigatorHost via Embed() rather than globally.

mojo/services/html_viewer/html_viewer.cc

Index: mojo/services/html_viewer/html_viewer.cc
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index 1be4217f406cf3ca08089d830d732430c3e95b27..ae6a1ca9eb8938c84e2acabc77d7d10c55325168 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -9,7 +9,6 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner_chromium.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/html_viewer/blink_platform_impl.h"
 #include "mojo/services/html_viewer/html_document_view.h"
 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
@@ -31,13 +30,9 @@ class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
   virtual void OnConnect(
       const mojo::String& url,
       URLResponsePtr response,
-      InterfaceRequest<ServiceProvider> service_provider) OVERRIDE {
-    ServiceProviderImpl* exported_services = new ServiceProviderImpl();
-    BindToRequest(exported_services, &service_provider);
-    scoped_ptr<ServiceProvider> remote(
-        exported_services->CreateRemoteServiceProvider());
-    new HTMLDocumentView(response.Pass(), remote.Pass(), exported_services,
-                         shell_);
+      InterfaceRequest<ServiceProvider> service_provider_request) OVERRIDE {
+    new HTMLDocumentView(
+        response.Pass(), service_provider_request.Pass(), shell_);
   }
 
   Shell* shell_;