Makes it possible to run content_browsertests with --as-browser and fake WebRTC devices.

content/test/content_test_launcher.cc

Index: content/test/content_test_launcher.cc
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 8ea54b1151614bd9bb3e4467dd1a2b86e37ebdf6..82798befcae883150e2783b5fd9cf9b583884731 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -10,7 +10,6 @@
 #include "base/path_service.h"
 #include "base/test/test_suite.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
-#include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_test_suite_base.h"
 #include "content/shell/shell_content_browser_client.h"
@@ -95,28 +94,6 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
     return std::string();
   }
 
-  virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE {
-#if defined(OS_WIN) || defined(OS_LINUX)
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(switches::kProcessType)) {
-      ShellMainDelegate delegate;
-#if defined(OS_WIN)
-      sandbox::SandboxInterfaceInfo sandbox_info = {0};
-      InitializeSandboxInfo(&sandbox_info);
-      *return_code =
-          ContentMain(GetModuleHandle(NULL), &sandbox_info, &delegate);
-#elif defined(OS_LINUX)
-      *return_code = ContentMain(argc,
-                                          const_cast<const char**>(argv),
-                                          &delegate);
-#endif  // defined(OS_WIN)
-      return true;
-    }
-#endif  // defined(OS_WIN) || defined(OS_LINUX)
-
-    return false;
-  }
-
   virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
     return ContentBrowserTestSuite(argc, argv).Run();
   }
@@ -128,6 +105,11 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate {
     return true;
   }
 
+ protected:
+  virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
+    return new ShellMainDelegate();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };