Simplify ContentHandlerFactory a bit.

shell/android/android_handler.cc

Index: shell/android/android_handler.cc
diff --git a/shell/android/android_handler.cc b/shell/android/android_handler.cc
index 5bb40600f611de52e16185ca44f816aad3d5c789..cf709f002a7b5991b9b0c3cf12f0b7ecd1e583cd 100644
--- a/shell/android/android_handler.cc
+++ b/shell/android/android_handler.cc
@@ -83,11 +83,9 @@ void RunAndroidApplication(JNIEnv* env,
 
 }  // namespace
 
-AndroidHandler::AndroidHandler() : content_handler_factory_(this) {
-}
+AndroidHandler::AndroidHandler() {}
 
-AndroidHandler::~AndroidHandler() {
-}
+AndroidHandler::~AndroidHandler() {}
 
 void AndroidHandler::RunApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
@@ -133,7 +131,7 @@ void AndroidHandler::Initialize(mojo::ApplicationImpl* app) {
 bool AndroidHandler::ConfigureIncomingConnection(
     mojo::ServiceProviderImpl* service_provider_impl) {
   service_provider_impl->AddService<mojo::ContentHandler>(
-      content_handler_factory_.GetInterfaceRequestHandler());
+      mojo::ContentHandlerFactory::GetInterfaceRequestHandler(this));
   return true;
 }