Simplify ContentHandlerFactory a bit.

shell/android/android_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 "shell/android/android_handler.h"
 
 #include <fcntl.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 65 matching lines @@
 
   // Run the application.
   RunNativeApplication(app_library, application_request.Pass());
   // TODO(vtl): See note about unloading and thread-local destructors above
   // declaration of |LoadNativeApplication()|.
   base::UnloadNativeLibrary(app_library);
 }
 
 }  // namespace
 
-AndroidHandler::AndroidHandler() : content_handler_factory_(this) {
-}
+AndroidHandler::AndroidHandler() {}
 
-AndroidHandler::~AndroidHandler() {
-}
+AndroidHandler::~AndroidHandler() {}
 
 void AndroidHandler::RunApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
   JNIEnv* env = AttachCurrentThread();
   uintptr_t tracing_id = reinterpret_cast<uintptr_t>(this);
   TRACE_EVENT_ASYNC_BEGIN1("android_handler", "AndroidHandler::RunApplication",
                            tracing_id, "url", std::string(response->url));
   base::FilePath extracted_dir;
   base::FilePath cache_dir;
@@ skipping 25 matching lines @@
 
 void AndroidHandler::Initialize(mojo::ApplicationImpl* app) {
   handler_task_runner_ = base::MessageLoop::current()->task_runner();
   mojo::ConnectToService(app->shell(), "mojo:url_response_disk_cache",
                          GetProxy(&url_response_disk_cache_));
 }
 
 bool AndroidHandler::ConfigureIncomingConnection(
     mojo::ServiceProviderImpl* service_provider_impl) {
   service_provider_impl->AddService<mojo::ContentHandler>(
-      content_handler_factory_.GetInterfaceRequestHandler());
+      mojo::ContentHandlerFactory::GetInterfaceRequestHandler(this));
   return true;
 }
 
 void AndroidHandler::ExtractApplication(base::FilePath* extracted_dir,
                                         base::FilePath* cache_dir,
                                         mojo::URLResponsePtr response,
                                         const base::Closure& callback) {
   url_response_disk_cache_->UpdateAndGetExtracted(
       response.Pass(),
       [extracted_dir, cache_dir, callback](mojo::Array<uint8_t> extracted_path,
@@ skipping 32 matching lines @@
       return ConvertUTF8ToJavaString(env, temporary_file.value()).Release();
     }
   }
 }
 
 bool RegisterAndroidHandlerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell