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

Unified Diff: chrome/test/base/ui_test_utils.h

Issue 8633004: Stop WebSocker server processes certainly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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 | « no previous file | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/ui_test_utils.h
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index c84f2840a9f0616e0d86899870b0ada0d53906f1..85afd44c87d4d971d51544afe0374eeaf3b0bb6b 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -14,6 +14,7 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
+#include "base/process.h"
#include "base/scoped_temp_dir.h"
#include "base/string16.h"
#include "chrome/browser/ui/view_ids.h"
@@ -28,6 +29,10 @@
#include "ui/gfx/native_widget_types.h"
#include "webkit/glue/window_open_disposition.h"
+#if defined(OS_WIN)
+#include "base/win/scoped_handle.h"
+#endif
+
class AppModalDialog;
class BookmarkModel;
class Browser;
@@ -336,6 +341,14 @@ class TestWebSocketServer {
// scope.
FilePath websocket_pid_file_;
+#if defined(OS_POSIX)
+ // ProcessHandle used to terminate child process.
+ base::ProcessHandle process_handle_;
+#elif defined(OS_WIN)
+ // JobObject used to clean up orphaned child process.
+ base::win::ScopedHandle job_handle_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(TestWebSocketServer);
};
« no previous file with comments | « no previous file | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698