Revert everything related to the relanding.

chrome/common/process_watcher_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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 "base/scoped_ptr.h"
 #include "base/env_var.h"
 #include "base/message_loop.h"
 #include "base/object_watcher.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 
 // Maximum amount of time (in milliseconds) to wait for the process to exit.
 static const int kWaitInterval = 2000;
 
 namespace {
@@ skipping 68 matching lines @@
   // If already signaled, then we are done!
   if (WaitForSingleObject(process, 0) == WAIT_OBJECT_0) {
     CloseHandle(process);
     return;
   }
 
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new TimerExpiredTask(process),
                                           kWaitInterval);
 }