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

Unified Diff: content/test/test_launcher.cc

Issue 10803026: Get content_browsertest working. I've added a simple test for now, and will convert the tests in sr… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
Index: content/test/test_launcher.cc
===================================================================
--- content/test/test_launcher.cc (revision 147044)
+++ content/test/test_launcher.cc (working copy)
@@ -41,6 +41,10 @@
namespace test_launcher {
+namespace {
+TestLauncherDelegate* g_launcher_delegate;
sky 2012/07/18 23:23:35 = NULL
jam 2012/07/18 23:44:06 that isn't necessary since it's initialized to NUL
+}
+
// The environment variable name for the total number of test shards.
const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
// The environment variable name for the test shard index.
@@ -573,6 +577,8 @@
int LaunchTests(TestLauncherDelegate* launcher_delegate,
int argc,
char** argv) {
+ DCHECK(!g_launcher_delegate);
+ g_launcher_delegate = launcher_delegate;
launcher_delegate->EarlyInitialize();
CommandLine::Init(argc, argv);
@@ -664,4 +670,8 @@
return exit_code;
}
+TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
+ return g_launcher_delegate;
+}
+
} // namespace test_launcher

Powered by Google App Engine
This is Rietveld 408576698