First cut at "content handling" support in Mojo.

mojo/shell/dynamic_service_loader_unittest.cc

Index: mojo/shell/dynamic_service_loader_unittest.cc
diff --git a/mojo/shell/dynamic_service_loader_unittest.cc b/mojo/shell/dynamic_service_loader_unittest.cc
index f70d11506c20b5a73025c961a92a4eecaabe51e7..7de6df0f4a029d2213937e4381ebd3fcb6e2c269 100644
--- a/mojo/shell/dynamic_service_loader_unittest.cc
+++ b/mojo/shell/dynamic_service_loader_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/dynamic_service_loader.h"
-#include "mojo/shell/dynamic_service_runner.h"
+#include "mojo/shell/in_process_dynamic_service_runner.h"
 #include "net/base/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,17 +20,19 @@ struct TestState {
   bool runner_was_destroyed;
 };
 
-class TestDynamicServiceRunner : public DynamicServiceRunner {
+class TestDynamicServiceRunner : public InProcessDynamicServiceRunner {
  public:
-  explicit TestDynamicServiceRunner(TestState* state) : state_(state) {}
+  explicit TestDynamicServiceRunner(Context* context, TestState* state)

[tim (not reviewing), 2014/08/05 23:52:37]

nit - don't need explicit

+      : InProcessDynamicServiceRunner(context), state_(state) {}
   virtual ~TestDynamicServiceRunner() {
     state_->runner_was_destroyed = true;
-    base::MessageLoop::current()->Quit();
   }
   virtual void Start(const base::FilePath& app_path,
                      ScopedMessagePipeHandle service_handle,
                      const base::Closure& app_completed_callback) OVERRIDE {
     state_->runner_was_started = true;
+    InProcessDynamicServiceRunner::Start(app_path, service_handle.Pass(),

[tim (not reviewing), 2014/08/05 23:52:37]

What is using a real InProcessDSR buying us?

[Aaron Boodman, 2014/08/06 00:37:22]

It's not needed with the current patch, I had the change in by mistake. I've
reverted it.

I think it was needed in one version of the code in order to get
app_completed_callback to run. But I can't remember exactly anymore. I think I
need dinner.

+                                         app_completed_callback);
   }
  private:
   TestState* state_;
@@ -42,7 +44,7 @@ class TestDynamicServiceRunnerFactory : public DynamicServiceRunnerFactory {
   virtual ~TestDynamicServiceRunnerFactory() {}
   virtual scoped_ptr<DynamicServiceRunner> Create(Context* context) OVERRIDE {
     return scoped_ptr<DynamicServiceRunner>(
-        new TestDynamicServiceRunner(state_));
+        new TestDynamicServiceRunner(context, state_));
   }
  private:
   TestState* state_;
@@ -73,9 +75,11 @@ TEST_F(DynamicServiceLoaderTest, DoesNotExist) {
   base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt"));
   GURL url(net::FilePathToFileURL(temp_dir.path().Append(nonexistent_file)));
   MessagePipe pipe;
-  loader_->LoadService(context_.service_manager(), url, pipe.handle0.Pass());
+  scoped_refptr<ServiceLoader::SimpleLoadServiceCallbacks> callbacks(
+      new ServiceLoader::SimpleLoadServiceCallbacks(pipe.handle0.Pass()));
+  loader_->LoadService(context_.service_manager(), url, callbacks);
   loop_.Run();
-  EXPECT_FALSE(state_.runner_was_started);
+  EXPECT_TRUE(state_.runner_was_started);
   EXPECT_TRUE(state_.runner_was_destroyed);
 }