Update monet.

mojo/application/content_handler_factory.cc

Index: mojo/application/content_handler_factory.cc
diff --git a/mojo/application/content_handler_factory.cc b/mojo/application/content_handler_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..53883150059243d58216ee11e0562ecdee8e51a0
--- /dev/null
+++ b/mojo/application/content_handler_factory.cc
@@ -0,0 +1,138 @@
+// 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 "mojo/application/content_handler_factory.h"
+
+#include <set>
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/memory/weak_ptr.h"
+#include "base/thread_task_runner_handle.h"
+#include "base/threading/platform_thread.h"
+#include "base/trace_event/trace_event.h"
+#include "mojo/application/application_runner_chromium.h"
+#include "mojo/message_pump/message_pump_mojo.h"
+#include "mojo/public/cpp/application/application_connection.h"
+#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/interface_factory_impl.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
+
+namespace mojo {
+
+namespace {
+
+class ApplicationThread : public base::PlatformThread::Delegate {
+ public:
+  ApplicationThread(
+      scoped_refptr<base::SingleThreadTaskRunner> handler_thread,
+      const base::Callback<void(ApplicationThread*)>& termination_callback,
+      ContentHandlerFactory::Delegate* handler_delegate,
+      InterfaceRequest<Application> application_request,
+      URLResponsePtr response)
+      : handler_thread_(handler_thread),
+        termination_callback_(termination_callback),
+        handler_delegate_(handler_delegate),
+        application_request_(application_request.Pass()),
+        response_(response.Pass()) {}
+
+ private:
+  void ThreadMain() override {
+    TRACE_EVENT_INSTANT1("content_handler", "ThreadMain()",
+                         TRACE_EVENT_SCOPE_THREAD, "url", response_->url.get());
+    base::PlatformThread::SetName(response_->url);
+    handler_delegate_->RunApplication(application_request_.Pass(),
+                                      response_.Pass());
+    handler_thread_->PostTask(FROM_HERE,
+                              base::Bind(termination_callback_, this));
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> handler_thread_;
+  base::Callback<void(ApplicationThread*)> termination_callback_;
+  ContentHandlerFactory::Delegate* handler_delegate_;
+  InterfaceRequest<Application> application_request_;
+  URLResponsePtr response_;
+
+  DISALLOW_COPY_AND_ASSIGN(ApplicationThread);
+};
+
+class ContentHandlerImpl : public ContentHandler {
+ public:
+  ContentHandlerImpl(ContentHandlerFactory::Delegate* delegate,
+                     InterfaceRequest<ContentHandler> request)
+      : delegate_(delegate),
+        binding_(this, request.Pass()),
+        weak_factory_(this) {}
+  ~ContentHandlerImpl() override {
+    // We're shutting down and doing cleanup. Cleanup may trigger calls back to
+    // OnThreadEnd(). As we're doing the cleanup here we don't want to do it in
+    // OnThreadEnd() as well. InvalidateWeakPtrs() ensures we don't get any
+    // calls to OnThreadEnd().
+    weak_factory_.InvalidateWeakPtrs();
+    for (auto thread : active_threads_) {
+      base::PlatformThread::Join(thread.second);
+      delete thread.first;
+    }
+  }
+
+ private:
+  // Overridden from ContentHandler:
+  void StartApplication(InterfaceRequest<Application> application_request,
+                        URLResponsePtr response) override {
+    TRACE_EVENT_INSTANT1("content_handler", "StartApplication()",
+                         TRACE_EVENT_SCOPE_THREAD, "url", response->url.get());
+    ApplicationThread* thread = new ApplicationThread(
+        base::ThreadTaskRunnerHandle::Get(),
+        base::Bind(&ContentHandlerImpl::OnThreadEnd,
+                   weak_factory_.GetWeakPtr()),
+        delegate_, application_request.Pass(), response.Pass());
+    base::PlatformThreadHandle handle;
+    bool launched = base::PlatformThread::Create(0, thread, &handle);
+    DCHECK(launched);
+    active_threads_[thread] = handle;
+  }
+
+  void OnThreadEnd(ApplicationThread* thread) {
+    DCHECK(active_threads_.find(thread) != active_threads_.end());
+    base::PlatformThreadHandle handle = active_threads_[thread];
+    active_threads_.erase(thread);
+    base::PlatformThread::Join(handle);
+    delete thread;
+  }
+
+  ContentHandlerFactory::Delegate* delegate_;
+  std::map<ApplicationThread*, base::PlatformThreadHandle> active_threads_;
+  StrongBinding<ContentHandler> binding_;
+  base::WeakPtrFactory<ContentHandlerImpl> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
+};
+
+}  // namespace
+
+ContentHandlerFactory::ContentHandlerFactory(Delegate* delegate)
+    : delegate_(delegate) {
+}
+
+ContentHandlerFactory::~ContentHandlerFactory() {
+}
+
+void ContentHandlerFactory::ManagedDelegate::RunApplication(
+    InterfaceRequest<Application> application_request,
+    URLResponsePtr response) {
+  base::MessageLoop loop(common::MessagePumpMojo::Create());
+  auto application =
+      this->CreateApplication(application_request.Pass(), response.Pass());
+  if (application)
+    loop.Run();
+}
+
+void ContentHandlerFactory::Create(ApplicationConnection* connection,
+                                   InterfaceRequest<ContentHandler> request) {
+  new ContentHandlerImpl(delegate_, request.Pass());
+}
+
+}  // namespace mojo