Revert 148281 - Remove details from BROWSER_CLOSING and BROWSER_CLOSED notifications.

chrome/browser/ui/browser_list_impl.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/ui/browser_list_impl.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
@@ skipping 52 matching lines @@
   // try to catch evil observers that change the list from under us.
   size_t original_count = observers_.size();
   FOR_EACH_OBSERVER(BrowserListObserver, observers_, OnBrowserAdded(browser));
   DCHECK_EQ(original_count, observers_.size())
       << "observer list modified during notification";
 }
 
 void BrowserListImpl::RemoveBrowser(Browser* browser) {
   RemoveBrowserFrom(browser, &last_active_browsers_);
 
+  // Many UI tests rely on closing the last browser window quitting the
+  // application.
+  // Mac: Closing all windows does not indicate quitting the application. Lie
+  // for now and ignore behavior outside of unit tests.
+  // ChromeOS: Force closing last window to close app with flag.
+  // TODO(andybons | pkotwicz): Fix the UI tests to Do The Right Thing.
+#if defined(OS_CHROMEOS)
+  bool closing_app;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableZeroBrowsersOpenForTests))
+    closing_app = (browsers_.size() == 1);
+  else
+    closing_app = (browsers_.size() == 1 &&
+        browser_shutdown::IsTryingToQuit());
+#else
+  bool closing_app = (browsers_.size() == 1);
+#endif  // OS_CHROMEOS
+
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser),
-      content::NotificationService::NoDetails());
+      content::Details<bool>(&closing_app));
 
   RemoveBrowserFrom(browser, &browsers_);
 
   // Do some basic checking to try to catch evil observers
   // that change the list from under us.
   size_t original_count = observers_.size();
   FOR_EACH_OBSERVER(BrowserListObserver, observers_, OnBrowserRemoved(browser));
   DCHECK_EQ(original_count, observers_.size())
       << "observer list modified during notification";
 
@@ skipping 92 matching lines @@
 
 void BrowserListImpl::RemoveBrowserFrom(Browser* browser,
                                         BrowserVector* browser_list) {
   const iterator remove_browser =
       std::find(browser_list->begin(), browser_list->end(), browser);
   if (remove_browser != browser_list->end())
     browser_list->erase(remove_browser);
 }
 
 }  // namespace chrome