Simplify ContentHandlerFactory a bit.

services/java_handler/java_handler.cc

Index: services/java_handler/java_handler.cc
diff --git a/services/java_handler/java_handler.cc b/services/java_handler/java_handler.cc
index 1387c1a2fb9cd022787b575679aaa554db0497c0..b7949de8e9eabf24271c3a478a3c3b219129013f 100644
--- a/services/java_handler/java_handler.cc
+++ b/services/java_handler/java_handler.cc
@@ -53,7 +53,7 @@ bool RegisterJNI(JNIEnv* env) {
 namespace services {
 namespace android {
 
-JavaHandler::JavaHandler() : content_handler_factory_(this) {}
+JavaHandler::JavaHandler() {}
 
 JavaHandler::~JavaHandler() {}
 
@@ -121,7 +121,7 @@ void JavaHandler::GetApplication(base::FilePath* archive_path,
 bool JavaHandler::ConfigureIncomingConnection(
     mojo::ServiceProviderImpl* service_provider_impl) {
   service_provider_impl->AddService<mojo::ContentHandler>(
-      content_handler_factory_.GetInterfaceRequestHandler());
+      mojo::ContentHandlerFactory::GetInterfaceRequestHandler(this));
   return true;
 }