Readding UI test I pulled yesterday; hopefully the bots will like it more now...

chrome/browser/views/frame/browser_view2.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/frame/browser_view2.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser.h"
@@ skipping 422 matching lines @@
   toolbar_->Update(contents, should_restore_state);
 }
 
 void BrowserView2::FocusToolbar() {
   toolbar_->RequestFocus();
 }
 
 void BrowserView2::DestroyBrowser() {
 }
 
+bool BrowserView2::IsBookmarkBarVisible() const {
+  if (!bookmark_bar_view_.get())
+    return false;
+
+  if (bookmark_bar_view_->IsNewTabPage() || bookmark_bar_view_->IsAnimating())
+    return true;
+
+  CSize sz;
+  bookmark_bar_view_->GetPreferredSize(&sz);
+  // 1 is the minimum in GetPreferredSize for the bookmark bar.
+  return sz.cy > 1;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView2, NotificationObserver implementation:
 
 void BrowserView2::Observe(NotificationType type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   if (type == NOTIFY_PREF_CHANGED &&
       *Details<std::wstring>(details).ptr() == prefs::kShowBookmarkBar) {
     if (MaybeShowBookmarkBar(browser_->GetSelectedTabContents()))
       Layout();
@@ skipping 617 matching lines @@
 // static
 void BrowserView2::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }