Simplify ContentHandlerFactory a bit.

services/python/content_handler/content_handler_main.cc

 // Copyright 2014 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 <dlfcn.h>
 #include <python2.7/Python.h>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/icu_util.h"
@@ skipping 186 matching lines @@
   }
 
   bool debug_;
 
   DISALLOW_COPY_AND_ASSIGN(PythonContentHandler);
 };
 
 class PythonContentHandlerApp : public ApplicationDelegate {
  public:
   PythonContentHandlerApp()
-      : content_handler_(false),
-        debug_content_handler_(true),
-        content_handler_factory_(&content_handler_),
-        debug_content_handler_factory_(&debug_content_handler_) {}
+      : content_handler_(false), debug_content_handler_(true) {}
 
  private:
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ServiceProviderImpl* service_provider_impl) override {
     if (IsDebug(service_provider_impl->connection_context().connection_url)) {
       service_provider_impl->AddService<mojo::ContentHandler>(
-          debug_content_handler_factory_.GetInterfaceRequestHandler());
+          ContentHandlerFactory::GetInterfaceRequestHandler(
+              &debug_content_handler_));
     } else {
       service_provider_impl->AddService<mojo::ContentHandler>(
-          content_handler_factory_.GetInterfaceRequestHandler());
+          ContentHandlerFactory::GetInterfaceRequestHandler(&content_handler_));
     }
     return true;
   }
 
   bool IsDebug(const std::string& requestedUrl) {
     GURL url(requestedUrl);
     if (url.has_query()) {
       std::vector<std::string> query_parameters = base::SplitString(
           url.query(), "&", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
       return std::find(query_parameters.begin(), query_parameters.end(),
                        "debug=true") != query_parameters.end();
     }
     return false;
   }
 
   PythonContentHandler content_handler_;
   PythonContentHandler debug_content_handler_;
-  ContentHandlerFactory content_handler_factory_;
-  ContentHandlerFactory debug_content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PythonContentHandlerApp);
 };
 
 }  // namespace content_handler
 }  // namespace python
 }  // namespace services
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new services::python::content_handler::PythonContentHandlerApp());
   return runner.Run(application_request);
 }