Simplify ContentHandlerFactory a bit.

services/nacl/sfi/content_handler_main.cc

Index: services/nacl/sfi/content_handler_main.cc
diff --git a/services/nacl/sfi/content_handler_main.cc b/services/nacl/sfi/content_handler_main.cc
index 3e0a51b54141be01c4b12e8199b3fea919263006..3894e3a1e285940596a7cbc99d4ff7657c924cb4 100644
--- a/services/nacl/sfi/content_handler_main.cc
+++ b/services/nacl/sfi/content_handler_main.cc
@@ -74,7 +74,7 @@ NaClDesc* FileStreamToNaClDesc(FILE* file_stream) {
 class NaClContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
-  NaClContentHandler() : content_handler_factory_(this) {}
+  NaClContentHandler() {}
 
  private:
   // Overridden from ApplicationDelegate:
@@ -106,7 +106,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;
   }
 
@@ -139,7 +139,6 @@ class NaClContentHandler : public mojo::ApplicationDelegate,
     NOTREACHED();
   }
 
-  mojo::ContentHandlerFactory content_handler_factory_;
   GURL url_;
   base::ScopedFILE irt_fp_;