Revert 80472 - GTTF: Detect browser crashes on shutdown in UI tests.Previously the automation fra...

chrome/common/service_process_util_unittest.cc

 // Copyright (c) 2011 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/service_process_util.h"
 
 #include "base/basictypes.h"
 
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
@@ skipping 162 matching lines @@
   for (int i = 0; !CheckServiceProcessReady() && i < 10; ++i) {
     base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
   }
   ASSERT_TRUE(CheckServiceProcessReady());
   std::string version;
   base::ProcessId pid;
   ASSERT_TRUE(GetServiceProcessData(&version, &pid));
   ASSERT_TRUE(ForceServiceProcessShutdown(version, pid));
   int exit_code = 0;
   ASSERT_TRUE(base::WaitForExitCodeWithTimeout(handle,
-      &exit_code, TestTimeouts::action_max_timeout_ms()));
-  base::CloseProcessHandle(handle);
+      &exit_code, TestTimeouts::action_timeout_ms() * 2));
   ASSERT_EQ(exit_code, 0);
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestSingleton) {
   ServiceProcessState state;
   EXPECT_FALSE(state.Initialize());
   return 0;
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestReadyTrue) {
@@ skipping 346 matching lines @@
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOMessageLoopProxy()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&ChangeAttr, bundle_path(), 0222));
   Run();
   ASSERT_TRUE(mock_launchd()->remove_called());
   ASSERT_TRUE(mock_launchd()->delete_called());
 }
 
 #endif  // !OS_MACOSX