Simplify ContentHandlerFactory a bit.

services/nacl/nonsfi/content_handler_main_pexe.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 <fcntl.h>
 
 #include "base/files/file_util.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "mojo/application/application_runner_chromium.h"
@@ skipping 13 matching lines @@
 #include "mojo/services/files/interfaces/files.mojom.h"
 #include "services/nacl/nonsfi/pnacl_compile.mojom-sync.h"
 #include "services/nacl/nonsfi/pnacl_link.mojom-sync.h"
 
 namespace nacl {
 namespace content_handler {
 
 class PexeContentHandler : public mojo::ApplicationDelegate,
                            public mojo::ContentHandlerFactory::Delegate {
  public:
-  PexeContentHandler() : content_handler_factory_(this) {}
+  PexeContentHandler() {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     mojo::ConnectToService(app->shell(), "mojo:pnacl_compile",
                            GetSynchronousProxy(&compiler_init_));
     mojo::ConnectToService(app->shell(), "mojo:pnacl_link",
                            GetSynchronousProxy(&linker_init_));
     mojo::ConnectToService(app->shell(), "mojo:files", GetProxy(&files_));
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     files_->OpenFileSystem("app_persistent_cache",
                            GetSynchronousProxy(&nexe_cache_directory_),
                            [&error](mojo::files::Error e) { error = e; });
     CHECK(files_.WaitForIncomingResponse());
     CHECK_EQ(mojo::files::Error::OK, error);
   }
 
   // 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;
   }
 
   int AccessFileFromCache(std::string& digest) {
     mojo::files::Error error = mojo::files::Error::INTERNAL;
     mojo::files::FilePtr nexe_cache_file;
     CHECK(nexe_cache_directory_->OpenFile(digest, GetProxy(&nexe_cache_file),
                                           mojo::files::kOpenFlagRead, &error));
     if (mojo::files::Error::OK == error)
       // Copy the mojo cached file into an open temporary file.
@@ skipping 78 matching lines @@
 
     // Pass the handle connecting us with mojo_shell to the nexe.
     MojoHandle handle = application_request.PassMessagePipe().release().value();
     ::nacl::MojoLaunchNexeNonsfi(nexe_fd, handle,
                                  false /* enable_translation_irt */);
   }
 
  private:
   mojo::SynchronousInterfacePtr<mojo::files::Directory> nexe_cache_directory_;
   mojo::files::FilesPtr files_;
-  mojo::ContentHandlerFactory content_handler_factory_;
   mojo::SynchronousInterfacePtr<mojo::nacl::PexeCompilerInit> compiler_init_;
   mojo::SynchronousInterfacePtr<mojo::nacl::PexeLinkerInit> linker_init_;
 
   DISALLOW_COPY_AND_ASSIGN(PexeContentHandler);
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::PexeContentHandler());
   return runner.Run(application_request);
 }