Revert of Fix Windows logoff race.

chrome/browser/lifetime/application_lifetime.cc

 // Copyright (c) 2012 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/browser/lifetime/application_lifetime.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
-#include "base/process/kill.h"
-#include "base/process/process.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/lifetime/browser_close_manager.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 244 matching lines @@
   browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
   // Write important data first.
   g_browser_process->EndSession();
 
-#if defined(OS_WIN)
-  base::win::SetShouldCrashOnProcessDetach(false);
-
-  // On Windows 7 and later, the system will consider the process ripe for
-  // termination as soon as it hides or destroys its windows. Since any
-  // execution past that point will be non-deterministically cut short, we
-  // might as well put ourselves out of that misery deterministically.
-  base::KillProcess(base::Process::Current().handle(), 0, false);
-#else
   CloseAllBrowsers();
 
   // Send out notification. This is used during testing so that the test harness
   // can properly shutdown before we exit.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SESSION_END,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
+#if defined(OS_WIN)
+  base::win::SetShouldCrashOnProcessDetach(false);
+#endif
   // This will end by terminating the process.
   content::ImmediateShutdownAndExitProcess();
-#endif  // defined(OS_WIN)
 }
 
 void IncrementKeepAliveCount() {
   // Increment the browser process refcount as long as we're keeping the
   // application alive.
   if (!WillKeepAlive())
     g_browser_process->AddRefModule();
   ++g_keep_alive_count;
 }
 
@@ skipping 94 matching lines @@
   //    environment is still active.
   if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
     return !ash::Shell::HasInstance();
   else if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
     return BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty();
 #endif
   return true;
 }
 
 }  // namespace chrome