Add --force-in-process flag to shell.

shell/dynamic_service_runner.h

Index: shell/dynamic_service_runner.h
diff --git a/shell/dynamic_service_runner.h b/shell/dynamic_service_runner.h
index b88067afe304efa0216b266e2c46129be982d14c..941152b919b43b182943418914972703fc84ca53 100644
--- a/shell/dynamic_service_runner.h
+++ b/shell/dynamic_service_runner.h
@@ -5,11 +5,8 @@
 #ifndef SHELL_DYNAMIC_SERVICE_RUNNER_H_
 #define SHELL_DYNAMIC_SERVICE_RUNNER_H_
 
-#include "base/callback_forward.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/public/cpp/system/core.h"
 #include "shell/application_manager/application_manager.h"
 
 namespace base {
@@ -21,8 +18,6 @@ class Application;
 
 namespace shell {
 
-class Context;
-
 // Loads the service in the DSO specificed by |app_path| and prepares it for
 // execution. Runs the DSO's exported function MojoMain().
 // The NativeLibrary is returned and ownership transferred to the caller.
@@ -30,24 +25,9 @@ class Context;
 // thread is destroyed and any thread-local destructors have been executed.
 base::NativeLibrary LoadAndRunNativeApplication(
     const base::FilePath& app_path,
-    mojo::NativeRunner::CleanupBehavior cleanup_behavior,
+    NativeRunner::CleanupBehavior cleanup_behavior,
     InterfaceRequest<Application> application_request);
 
-// A generic factory.
-template <class DynamicServiceRunnerImpl>
-class DynamicServiceRunnerFactoryImpl : public mojo::NativeRunnerFactory {
- public:
-  DynamicServiceRunnerFactoryImpl(shell::Context* context)
-      : context_(context) {}
-  virtual ~DynamicServiceRunnerFactoryImpl() {}
-  scoped_ptr<NativeRunner> Create() override {
-    return scoped_ptr<NativeRunner>(new DynamicServiceRunnerImpl(context_));
-  }
-
- private:
-  shell::Context* context_;
-};
-
 }  // namespace shell
 }  // namespace mojo