Simplify ContentHandlerFactory a bit.

mojo/application/content_handler_factory.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 "mojo/application/content_handler_factory.h"
 
-#include <set>
+#include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 86 matching lines @@
   ContentHandlerFactory::Delegate* delegate_;
   std::map<ApplicationThread*, base::PlatformThreadHandle> active_threads_;
   StrongBinding<ContentHandler> binding_;
   base::WeakPtrFactory<ContentHandlerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
 }  // namespace
 
-ContentHandlerFactory::ContentHandlerFactory(Delegate* delegate)
-    : delegate_(delegate) {}
-
-ContentHandlerFactory::~ContentHandlerFactory() {}
-
-void ContentHandlerFactory::Create(
-    const ConnectionContext& connection_context,
-    InterfaceRequest<ContentHandler> content_handler_request) {
-  new ContentHandlerImpl(delegate_, content_handler_request.Pass());
-}
-
+// static
 ServiceProviderImpl::InterfaceRequestHandler<ContentHandler>
-ContentHandlerFactory::GetInterfaceRequestHandler() {
-  return [this](const ConnectionContext& connection_context,
-                InterfaceRequest<ContentHandler> content_handler_request) {
-    Create(connection_context, content_handler_request.Pass());
+ContentHandlerFactory::GetInterfaceRequestHandler(Delegate* delegate) {
+  return [delegate](const ConnectionContext& connection_context,
+                    InterfaceRequest<ContentHandler> content_handler_request) {
+    new ContentHandlerImpl(delegate, content_handler_request.Pass());
   };
 }
 
 void ContentHandlerFactory::ManagedDelegate::RunApplication(
     InterfaceRequest<Application> application_request,
     URLResponsePtr response) {
   base::MessageLoop loop(common::MessagePumpMojo::Create());
   auto application =
       this->CreateApplication(application_request.Pass(), response.Pass());
   if (application)
     loop.Run();
 }
 
 }  // namespace mojo