Delete "shutdown without closing browsers" path

chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 977 matching lines @@
   other_bookmarked_button_->SetText(model_->other_node()->GetTitle());
   UpdateColors();
   UpdateOtherBookmarksVisibility();
   other_bookmarked_button_->SetEnabled(true);
 
   Layout();
   SchedulePaint();
 }
 
 void BookmarkBarView::BookmarkModelBeingDeleted(BookmarkModel* model) {
-  // In normal shutdown The bookmark model should never be deleted before us.
-  // When X exits suddenly though, it can happen, This code exists
-  // to check for regressions in shutdown code and not crash.
-  if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers())
-    NOTREACHED();
-
+  NOTREACHED();

[Albert Bodenhamer, 2014/03/23 01:38:36]

It doesn't make sense to have a NOTREACHED() followed by the cleanup code.

[oshima, 2014/03/23 04:07:35]

This method should not be called in normal path, and NOTREACHED was always valid
when "ShuttingDownWithoutClosingBrowesrs()" is false,
as you can see.

Since I'm removing the special path, NOTREACHED should remain and
the following code is a fallback path for release build.

[Albert Bodenhamer, 2014/03/24 02:22:42]

Isn't NOTREACHED basically a DCHECK? I thought the normal rule was not to handle
DCHECK failure cases. Either calling this code is an error (NOTREACHED) or we
should treat this as a rare, but valid, cleanup case.

I'm not going to hold up the CL any more over it. Just want to understand the
motivation.

   // Do minimal cleanup, presumably we'll be deleted shortly.
   model_->RemoveObserver(this);
   model_ = NULL;
 }
 
 void BookmarkBarView::BookmarkNodeMoved(BookmarkModel* model,
                                         const BookmarkNode* old_parent,
                                         int old_index,
                                         const BookmarkNode* new_parent,
                                         int new_index) {
@@ skipping 841 matching lines @@
   DCHECK(apps_page_shortcut_);
   // Only perform layout if required.
   bool visible = chrome::ShouldShowAppsShortcutInBookmarkBar(
       browser_->profile(), browser_->host_desktop_type());
   if (apps_page_shortcut_->visible() == visible)
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   Layout();
 }