Simplify ContentHandlerFactory a bit.

services/dart/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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
@@ skipping 117 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> handler_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(DartContentHandler);
 };
 
 class DartContentHandlerApp : public mojo::ApplicationDelegate {
  public:
   DartContentHandlerApp()
       : content_handler_(this, false),
         strict_content_handler_(this, true),
-        content_handler_factory_(&content_handler_),
-        strict_content_handler_factory_(&strict_content_handler_),
         service_connector_(nullptr),
         default_strict_(false),
         run_on_message_loop_(false) {}
 
   ~DartContentHandlerApp() override {
     // Shutdown the controller.
     mojo::dart::DartController::Shutdown();
     delete service_connector_;
   }
 
@@ skipping 85 matching lines @@
     }
   }
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ServiceProviderImpl* service_provider_impl) override {
     bool strict = HasStrictQueryParam(
         service_provider_impl->connection_context().connection_url);
     if (default_strict_ || strict) {
       service_provider_impl->AddService<mojo::ContentHandler>(
-          strict_content_handler_factory_.GetInterfaceRequestHandler());
+          mojo::ContentHandlerFactory::GetInterfaceRequestHandler(
+              &strict_content_handler_));
     } else {
       service_provider_impl->AddService<mojo::ContentHandler>(
-          content_handler_factory_.GetInterfaceRequestHandler());
+          mojo::ContentHandlerFactory::GetInterfaceRequestHandler(
+              &content_handler_));
     }
     return true;
   }
 
   mojo::TracingImpl tracing_;
   DartContentHandler content_handler_;
   DartContentHandler strict_content_handler_;
-  mojo::ContentHandlerFactory content_handler_factory_;
-  mojo::ContentHandlerFactory strict_content_handler_factory_;
   mojo::URLResponseDiskCachePtr url_response_disk_cache_;
   ContentHandlerAppServiceConnector* service_connector_;
   DartTracingImpl dart_tracing_;
   bool default_strict_;
   bool run_on_message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(DartContentHandlerApp);
 };
 
 scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
@@ skipping 57 matching lines @@
                     pause_isolates_on_exit));
   }
 }
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   return runner.Run(application_request);
 }