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

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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 "content/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_suite.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "content/public/app/content_main.h"
+#include "content/public/app/content_main_delegate.h"
 #include "content/public/app/startup_helper_win.h"
 #include "content/public/common/sandbox_init.h"
+#include "content/public/common/content_switches.h"

[jam, 2012/09/05 15:26:51]

nit: order

[phoglund_chromium, 2012/09/06 08:45:28]

Done.

 #include "content/public/test/browser_test.h"
 #include "net/base/escape.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/base_switches.h"
 #include "content/common/sandbox_policy.h"
 #include "sandbox/win/src/dep.h"
 #include "sandbox/win/src/sandbox_factory.h"
 #include "sandbox/win/src/sandbox_types.h"
@@ skipping 599 matching lines @@
 const char kRunManualTestsFlag[] = "run-manual";
 
 // The following is kept for historical reasons (so people that are used to
 // using it don't get surprised).
 const char kChildProcessFlag[]   = "child";
 
 const char kHelpFlag[]   = "help";
 
 const char kWarmupFlag[] = "warmup";
 
+const char kLaunchAsBrowser[] = "as-browser";

[jam, 2012/09/05 15:26:51]

nit: order

[phoglund_chromium, 2012/09/06 08:45:28]

Done. The other switches weren't in order so I sorted them. I assume you meant
alphabetical order?

+
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
+bool ShouldRunInBrowserMode() {

[jam, 2012/09/05 15:26:51]

nit: this isn't just for running in browser, it's also for all child processes
(i.e. renderer), so to make it clearer, name this

ShouldRunMain(). and also below, RunMain()

[phoglund_chromium, 2012/09/06 08:45:28]

Ok, then maybe it should even be ShouldRunContentMain and RunContentMain since
that's what we are doing?

+#if defined(OS_WIN) || defined(OS_LINUX)
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  return command_line->HasSwitch(switches::kProcessType) ||
+         command_line->HasSwitch(kLaunchAsBrowser);
+#else
+  return false;
+#endif  // defined(OS_WIN) || defined(OS_LINUX)
+}
+
+int RunInBrowserMode(int argc, char** argv,
+                     TestLauncherDelegate* launcher_delegate) {
+#if defined(OS_WIN)
+  sandbox::SandboxInterfaceInfo sandbox_info = {0};
+  content::InitializeSandboxInfo(&sandbox_info);
+  scoped_ptr<content::ContentMainDelegate> chrome_main_delegate(
+      launcher_delegate->CreateContentMainDelegate());
+  return content::ContentMain(GetModuleHandle(NULL),
+                              &sandbox_info,
+                              chrome_main_delegate.get());
+#elif defined(OS_LINUX)
+  scoped_ptr<content::ContentMainDelegate> chrome_main_delegate(
+      launcher_delegate->CreateContentMainDelegate());
+  return content::ContentMain(argc,
+                              const_cast<const char**>(argv),
+                              chrome_main_delegate.get());
+#endif  // defined(OS_WIN)
+  NOTREACHED();
+  return 0;
+}
+
 int LaunchTests(TestLauncherDelegate* launcher_delegate,
                 int argc,
                 char** argv) {
   DCHECK(!g_launcher_delegate);
   g_launcher_delegate = launcher_delegate;
 
   CommandLine::Init(argc, argv);
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(kHelpFlag)) {
@@ skipping 12 matching lines @@
 #if defined(OS_WIN)
     if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
       sandbox::SandboxInterfaceInfo sandbox_info;
       content::InitializeSandboxInfo(&sandbox_info);
       content::InitializeSandbox(&sandbox_info);
     }
 #endif
     return launcher_delegate->RunTestSuite(argc, argv);
   }
 
-  int return_code = 0;
-  if (launcher_delegate->Run(argc, argv, &return_code))
-    return return_code;
+  if (ShouldRunInBrowserMode()) {

[jam, 2012/09/05 15:26:51]

what's the point of splitting this into two functions, when they're called from
one place together?

nit: this file doesn't use brace brackets for one line statements

[phoglund_chromium, 2012/09/06 08:45:28]

I thought the code read better like this. The semantics of
launcher_delegate->Run() returning false seemed far from obvious to me - does it
mean it failed to run or that it doesn't want to run, or what? I think this is a
bit clearer.

+    return RunInBrowserMode(argc, argv, launcher_delegate);
+  }
 
   base::AtExitManager at_exit;
 
   int32 total_shards;
   int32 shard_index;
   bool should_shard = ShouldShard(&total_shards, &shard_index);
 
   fprintf(stdout,
       "Starting tests...\n"
       "IMPORTANT DEBUGGING NOTE: each test is run inside its own process.\n"
@@ skipping 49 matching lines @@
       cycles--;
   }
   return exit_code;
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 }  // namespace test_launcher