Simplify ContentHandlerFactory a bit.

examples/forwarding_content_handler/forwarding_content_handler.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 <utility>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
@@ skipping 36 matching lines @@
   }
 
   Binding<Application> binding_;
   std::string target_url_;
   ShellPtr shell_;
 };
 
 class ForwardingContentHandler : public ApplicationDelegate,
                                  public ContentHandlerFactory::ManagedDelegate {
  public:
-  ForwardingContentHandler() : content_handler_factory_(this) {}
+  ForwardingContentHandler() {}
 
  private:
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<ContentHandler>(
-        content_handler_factory_.GetInterfaceRequestHandler());
+        ContentHandlerFactory::GetInterfaceRequestHandler(this));
     return true;
   }
 
   // Overridden from ContentHandlerFactory::ManagedDelegate:
   scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
   CreateApplication(InterfaceRequest<Application> application_request,
                     URLResponsePtr response) override {
     CHECK(!response.is_null());
     const std::string requestor_url(response->url);
     std::string target_url;
     if (!common::BlockingCopyToString(response->body.Pass(), &target_url)) {
       LOG(WARNING) << "unable to read target URL from " << requestor_url;
       return nullptr;
     }
     return make_handled_factory_holder(
         new ForwardingApplicationImpl(application_request.Pass(), target_url));
   }
 
-  ContentHandlerFactory content_handler_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ForwardingContentHandler);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new mojo::examples::ForwardingContentHandler());
   return runner.Run(application_request);
 }