Simplify ContentHandlerFactory a bit.

services/nacl/nonsfi/content_handler_main_nexe.cc

Index: services/nacl/nonsfi/content_handler_main_nexe.cc
diff --git a/services/nacl/nonsfi/content_handler_main_nexe.cc b/services/nacl/nonsfi/content_handler_main_nexe.cc
index 0ccada187dfe735640b18ffbc4145f1b9d3fd50c..158816a7506abe524baf329fa955bae0ebd3e91c 100644
--- a/services/nacl/nonsfi/content_handler_main_nexe.cc
+++ b/services/nacl/nonsfi/content_handler_main_nexe.cc
@@ -20,7 +20,7 @@ namespace content_handler {
 class NaClContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
-  NaClContentHandler() : content_handler_factory_(this) {}
+  NaClContentHandler() {}
 
  private:
   // Overridden from ApplicationDelegate:
@@ -30,7 +30,7 @@ class NaClContentHandler : public mojo::ApplicationDelegate,
   bool ConfigureIncomingConnection(
       mojo::ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<mojo::ContentHandler>(
-        content_handler_factory_.GetInterfaceRequestHandler());
+        mojo::ContentHandlerFactory::GetInterfaceRequestHandler(this));
     return true;
   }
 
@@ -57,8 +57,6 @@ class NaClContentHandler : public mojo::ApplicationDelegate,
     MojoLaunchNexeNonsfi(fd, handle, false /* enable_translation_irt */);
   }
 
-  mojo::ContentHandlerFactory content_handler_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(NaClContentHandler);
 };