Fixes regression where bookmark bar would appear all black. Actually,...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "base/string_util.h"
 #include "base/base_drag_source.h"
@@ skipping 853 matching lines @@
 }
 
 void BookmarkBarView::DidChangeBounds(const gfx::Rect& previous,
                                       const gfx::Rect& current) {
   Layout();
 }
 
 void BookmarkBarView::ViewHierarchyChanged(bool is_add,
                                            View* parent,
                                            View* child) {
-  // See http://code.google.com/p/chromium/issues/detail?id=7857 . It seems
-  // as though the bookmark bar is getting unintentionally removed.
-  DCHECK(testing_ || child != this || is_add ||
-         static_cast<BrowserView*>(parent)->is_removing_bookmark_bar());
-
   if (is_add && child == this && height() > 0) {
     // We only layout while parented. When we become parented, if our bounds
     // haven't changed, DidChangeBounds won't get invoked and we won't layout.
     // Therefore we always force a layout when added.
     Layout();
   }
 }
 
 void BookmarkBarView::Paint(ChromeCanvas* canvas) {
   if (IsDetachedStyle()) {
@@ skipping 976 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }