Revert of Delete "shutdown without closing browsers" path

Revert of Delete "shutdown without closing browsers" path (https://codereview.chromium.org/205963005/)

Reason for revert:
Didn't compile on Linux GTK builder.

http://build.chromium.org/p/chromium.linux/builders/Linux%20GTK%20Builder/builds/1997

../../chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc: In member function 'virtual void BookmarkBarGtk::BookmarkModelBeingDeleted(BookmarkModel*)':
../../chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc:896:8:error: 'ShuttingDownWithoutClosingBrowsers' is not a member of 'browser_shutdown'

Original issue's description:
> Delete "shutdown without closing browsers"
> 
> Removing unused ShellDelegate::Shutdown()
> 
> Added new PreShutdown to safely cleanup DisplayObserver.
> 
> Chrome no longer access X during shutdown (except for deleting X window, which is safe), so normal SessionEnd
> path should work.
> 
> There is another issue when this happens during login screen, and I'll file a separate bug for it.
> 
> BUG=336653
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259061

TBR=abodenha@chromium.org,thestig@chromium.org,oshima@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=336653
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259085

[michaeln, 2014-03-25 01:38:53]

Created Revert of Delete "shutdown without closing browsers" path

[commit-bot: I haz the power, 2014-03-25 01:39:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/michaeln@chromium.org/210673002/1

[commit-bot: I haz the power, 2014-03-25 01:41:09]

Change committed as 259085

[oshima, 2014-03-25 01:42:17]

On 2014/03/25 01:41:09, I haz the power (commit-bot) wrote:
> Change committed as 259085

oh, we still have gtk bot but no CQ?

[Matt Giuca, 2014-03-25 04:47:24]

Yes :(

[Matt Giuca, 2014-03-25 04:52:13]

If you're trying to re-land this CL (and don't have a GTK build set up), I can
confirm that this patch compiles on SVN 259084 (which was before your CL was
reverted):

--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -891,11 +891,6 @@ void BookmarkBarGtk::BookmarkModelLoaded(BookmarkModel*
model,
 }
 
 void BookmarkBarGtk::BookmarkModelBeingDeleted(BookmarkModel* model) {
-  // The bookmark model should never be deleted before us. This code exists
-  // to check for regressions in shutdown code and not crash.
-  if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
-    NOTREACHED();
-
   // Do minimal cleanup, presumably we'll be deleted shortly.
   model_->RemoveObserver(this);
   model_ = NULL;

[oshima, 2014-03-25 05:13:30]

On 2014/03/25 04:52:13, Matt Giuca wrote:
> If you're trying to re-land this CL (and don't have a GTK build set up), I can
> confirm that this patch compiles on SVN 259084 (which was before your CL was
> reverted):
> 
> --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
> +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
> @@ -891,11 +891,6 @@ void BookmarkBarGtk::BookmarkModelLoaded(BookmarkModel*
> model,
>  }
>  
>  void BookmarkBarGtk::BookmarkModelBeingDeleted(BookmarkModel* model) {
> -  // The bookmark model should never be deleted before us. This code exists
> -  // to check for regressions in shutdown code and not crash.
> -  if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
> -    NOTREACHED();
> -
>    // Do minimal cleanup, presumably we'll be deleted shortly.
>    model_->RemoveObserver(this);
>    model_ = NULL;

Thank you for the revert. I was a bit surprised that this broke gtk build
as this should be chromeos only, but I apparently forgot that chromeos was
using gtk long time ago :)