Simplify ContentHandlerFactory a bit.

mojo/application/content_handler_factory.cc

Index: mojo/application/content_handler_factory.cc
diff --git a/mojo/application/content_handler_factory.cc b/mojo/application/content_handler_factory.cc
index 8b104489a4fe7727f51db3c9db0807c6295dabc4..e27996adfa92b8343f773a59c3f2f743c185e25b 100644
--- a/mojo/application/content_handler_factory.cc
+++ b/mojo/application/content_handler_factory.cc
@@ -4,7 +4,7 @@
 
 #include "mojo/application/content_handler_factory.h"
 
-#include <set>
+#include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -111,22 +111,12 @@ class ContentHandlerImpl : public ContentHandler {
 
 }  // 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());
   };
 }