Simplify ContentHandlerFactory a bit.

services/nacl/sfi/content_handler_main.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
@@ skipping 56 matching lines @@
   CHECK_EQ(fclose(file_stream), 0) << "Failed to close temp file";
 
   return desc;
 }
 
 }  // namespace
 
 class NaClContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
-  NaClContentHandler() : content_handler_factory_(this) {}
+  NaClContentHandler() {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     url_ = GURL(app->url());
 
     mojo::NetworkServicePtr network_service;
     mojo::ConnectToService(app->shell(), "mojo:network_service",
                            GetProxy(&network_service));
 
@@ skipping 11 matching lines @@
     CHECK(irt_url.is_valid()) << "Cannot resolve IRT URL";
 
     irt_fp_ = TempFileForURL(url_loader, irt_url);
     CHECK(irt_fp_) << "Could not acquire the IRT";
   }
 
   // Overridden from 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;
   }
 
   // Overridden from ContentHandlerFactory::Delegate:
   void RunApplication(
       mojo::InterfaceRequest<mojo::Application> application_request,
       mojo::URLResponsePtr response) override {
     // Needed to use Mojo interfaces on this thread.
     base::MessageLoop loop(mojo::common::MessagePumpMojo::Create());
 
@@ skipping 12 matching lines @@
     // Run.
     int exit_code = mojo::LaunchNaCl(
         nexe_desc, irt_desc, 0, nullptr,
         application_request.PassMessagePipe().release().value());
 
     // Exits the process cleanly, does not return.
     mojo::NaClExit(exit_code);
     NOTREACHED();
   }
 
-  mojo::ContentHandlerFactory content_handler_factory_;
   GURL url_;
   base::ScopedFILE irt_fp_;
 
   mojo::URLLoaderPtr url_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClContentHandler);
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::NaClContentHandler());
   return runner.Run(application_request);
 }