Simplify ContentHandlerFactory a bit.

mojo/application/content_handler_factory.h

 // 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.
 
 #ifndef MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_
 #define MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
 
 namespace mojo {
 
 struct ConnectionContext;
 
-// TODO(vtl): Should this even be a class, now that InterfaceFactory is no more?
+// TODO(vtl): Nuke this class. Now it's only a "namespace" for stuff, most of
+// which is overcomplicated.
 class ContentHandlerFactory {
  public:
   class HandledApplicationHolder {
    public:
     virtual ~HandledApplicationHolder() {}
   };
 
   class Delegate {
    public:
     virtual ~Delegate() {}
@@ skipping 13 matching lines @@
     // application ends.
     virtual scoped_ptr<HandledApplicationHolder> CreateApplication(
         InterfaceRequest<Application> application_request,
         URLResponsePtr response) = 0;
 
    private:
     void RunApplication(InterfaceRequest<Application> application_request,
                         URLResponsePtr response) override;
   };
 
-  explicit ContentHandlerFactory(Delegate* delegate);
-  ~ContentHandlerFactory();
-
-  // Creates a content handler for the given connection (context and request).
-  void Create(const ConnectionContext& connection_context,
-              InterfaceRequest<ContentHandler> content_handler_request);
-
   // For use with |ServiceProviderImpl::AddService<ContentHandler>()|.
-  ServiceProviderImpl::InterfaceRequestHandler<ContentHandler>
-  GetInterfaceRequestHandler();
-
- private:
-  Delegate* delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentHandlerFactory);
+  static ServiceProviderImpl::InterfaceRequestHandler<ContentHandler>
+  GetInterfaceRequestHandler(Delegate* delegate);
 };
 
 template <class A>
 class HandledApplicationHolderImpl
     : public ContentHandlerFactory::HandledApplicationHolder {
  public:
   explicit HandledApplicationHolderImpl(A* value) : value_(value) {}
 
  private:
   scoped_ptr<A> value_;
 };
 
 template <class A>
 scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
 make_handled_factory_holder(A* value) {
   return make_scoped_ptr(new HandledApplicationHolderImpl<A>(value));
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_