Index: testrunner.cc |
diff --git a/testrunner.cc b/testrunner.cc |
index a8c4626372a764e3b54037a0abdd8980b74ae1c4..e4daaea40787e12a95de24082d0ff9f459700216 100644 |
--- a/testrunner.cc |
+++ b/testrunner.cc |
@@ -4,20 +4,12 @@ |
// based on pam_google_testrunner.cc |
+#include <chromeos/test_helpers.h> |
#include <gtest/gtest.h> |
#include <glib-object.h> |
-#include <base/logging.h> |
-int main(int argc, char **argv) { |
+int main(int argc, char** argv) { |
::g_type_init(); |
- |
-#if 0 |
- // Initializing with a name does not seem to be changing the log file name. |
- // And options for logging to stderr are being ignored. If we don't initialize |
- // logging goes to stderr by default. |
- google::InitGoogleLogging("power_unittest"); |
-#endif |
- |
- ::testing::InitGoogleTest(&argc, argv); |
+ SetUpTests(&argc, argv, true); |
return RUN_ALL_TESTS(); |
} |