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

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/base_drag_source.h"
 #include "base/gfx/skia_utils.h"
@@ skipping 247 matching lines @@
   virtual void AnimationProgressed(const Animation* animation) {
     ChromeViews::TextButton::AnimationProgressed(animation);
     SchedulePaint();
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
   scoped_ptr<SlideAnimation> show_animation_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BookmarkButton);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkButton);
 };
 
 // DropInfo -------------------------------------------------------------------
 
 // Tracks drops on the BookmarkBarView.
 
 struct DropInfo {
   DropInfo() : drop_index(-1), is_menu_showing(false), valid(false) {}
 
   // Whether the data is valid.
@@ skipping 259 matching lines @@
 
   // Mapping from node to menu id. This only contains entries for nodes of type
   // URL.
   std::map<BookmarkBarNode*, int> node_to_menu_id_map_;
 
   // Data for the drop.
   BookmarkDragData drop_data_;
 
   scoped_ptr<BookmarkBarContextMenuController> context_menu_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(MenuRunner);
+  DISALLOW_COPY_AND_ASSIGN(MenuRunner);
 };
 
 // ButtonSeparatorView  --------------------------------------------------------
 
 // TODO(sky/glen): this is temporary, need to decide on what this should
 // look like.
 class ButtonSeparatorView : public ChromeViews::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
@@ skipping 19 matching lines @@
     canvas->drawRect(rc_down, paint_down);
   }
 
   virtual void GetPreferredSize(CSize* out) {
     // We get the full height of the bookmark bar, so that the height returned
     // here doesn't matter.
     out->SetSize(kSeparatorWidth, 1);
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(ButtonSeparatorView);
+  DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView);
 };
 
 }  // namespace
 
 // BookmarkBarView ------------------------------------------------------------
 
 // static
 const int BookmarkBarView::kMaxButtonWidth = 150;
 
 // static
@@ skipping 1233 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;
 }