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

Unified Diff: content/common/process_watcher_win.cc

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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/common/process_watcher_unittest.cc ('k') | content/common/result_codes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/process_watcher_win.cc
===================================================================
--- content/common/process_watcher_win.cc (revision 78452)
+++ content/common/process_watcher_win.cc (working copy)
@@ -2,14 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/process_watcher.h"
+#include "content/common/process_watcher.h"
#include "base/scoped_ptr.h"
-#include "base/environment.h"
#include "base/message_loop.h"
#include "base/win/object_watcher.h"
-#include "chrome/common/env_vars.h"
-#include "chrome/common/result_codes.h"
+#include "content/common/result_codes.h"
// Maximum amount of time (in milliseconds) to wait for the process to exit.
static const int kWaitInterval = 2000;
@@ -50,16 +48,6 @@
private:
void KillProcess() {
- scoped_ptr<base::Environment> env(base::Environment::Create());
- if (env->HasVar(env_vars::kHeadless)) {
- // If running the distributed tests, give the renderer a little time
- // to figure out that the channel is shutdown and unwind.
- if (WaitForSingleObject(process_, kWaitInterval) == WAIT_OBJECT_0) {
- OnObjectSignaled(process_);
- return;
- }
- }
-
// OK, time to get frisky. We don't actually care when the process
// terminates. We just care that it eventually terminates, and that's what
// TerminateProcess should do for us. Don't check for the result code since
« no previous file with comments | « content/common/process_watcher_unittest.cc ('k') | content/common/result_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698