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

Unified Diff: testrunner.cc

Issue 3608015: AU: Catch terminate signals and block exit if necessary. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/update_engine.git
Patch Set: typo Created 10 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
« terminator.cc ('K') | « terminator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testrunner.cc
diff --git a/testrunner.cc b/testrunner.cc
index 3e40e1fcdcc2ec28b816e02c46c1866c8a4d671e..748dd5f5c27291121aa30834580a0e04a55c5c45 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -4,21 +4,24 @@
// based on pam_google_testrunner.cc
+#include <base/at_exit.h>
+#include <base/command_line.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <glib.h>
#include <glib-object.h>
#include <gtest/gtest.h>
-#include "base/at_exit.h"
-#include "base/command_line.h"
+
#include "update_engine/subprocess.h"
+#include "update_engine/terminator.h"
int main(int argc, char **argv) {
::g_type_init();
g_thread_init(NULL);
dbus_g_thread_init();
base::AtExitManager exit_manager;
+ chromeos_update_engine::Terminator::Init();
chromeos_update_engine::Subprocess::Init();
CommandLine::Init(argc, argv);
::testing::InitGoogleTest(&argc, argv);
« terminator.cc ('K') | « terminator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698