Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: content/test/test_launcher.cc

Issue 8137012: Make an empty content browser test work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/test_launcher.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_launcher.cc
===================================================================
--- content/test/test_launcher.cc (revision 104112)
+++ content/test/test_launcher.cc (working copy)
@@ -27,6 +27,14 @@
#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/src/dep.h"
+#include "sandbox/src/sandbox_factory.h"
+#include "sandbox/src/sandbox_types.h"
+#endif
+
namespace test_launcher {
namespace {
@@ -550,10 +558,38 @@
return 0;
}
+ // TODO(pkasting): This "single_process vs. single-process" design is
+ // terrible UI. Instead, there should be some sort of signal flag on the
+ // command line, with all subsequent arguments passed through to the
+ // underlying browser.
+ if (command_line->HasSwitch(kSingleProcessTestsFlag) ||
+ command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) ||
+ command_line->HasSwitch(kGTestListTestsFlag) ||
+ command_line->HasSwitch(kGTestHelpFlag)) {
+#if defined(OS_WIN)
+ if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
+ // This is the browser process, so setup the sandbox broker.
+ sandbox::BrokerServices* broker_services =
+ sandbox::SandboxFactory::GetBrokerServices();
+ if (broker_services) {
+ sandbox::InitBrokerServices(broker_services);
+ // Precreate the desktop and window station used by the renderers.
+ sandbox::TargetPolicy* policy = broker_services->CreatePolicy();
+ sandbox::ResultCode result = policy->CreateAlternateDesktop(true);
+ CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result);
+ policy->Release();
+ }
+ }
+#endif
+ return launcher_delegate->RunTestSuite(argc, argv);
+ }
+
int return_code = 0;
if (launcher_delegate->Run(argc, argv, &return_code))
return return_code;
+ base::AtExitManager at_exit;
+
int32 total_shards;
int32 shard_index;
bool should_shard = ShouldShard(&total_shards, &shard_index);
« no previous file with comments | « content/test/test_launcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698