[Mac] Apply CrTrackingArea to the two other places where we get |-mouseMoved:| zombie messages.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/themes/browser_theme_provider.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
+#import "chrome/browser/ui/cocoa/tracking_area.h"
 
 using bookmarks::kBookmarkBarMenuCornerRadius;
 
 namespace {
 
 // Frequency of the scrolling timer in seconds.
 const NSTimeInterval kBookmarkBarFolderScrollInterval = 0.1;
 
 // Amount to scroll by per timer fire.  We scroll rather slowly; to
 // accomodate we do several at a time.
@@ skipping 921 matching lines @@
 - (void)mouseExited:(NSEvent*)theEvent {
   [self endScroll];
 }
 
 // Add a tracking area so we know when the mouse is pinned to the top
 // or bottom of the screen.  If that happens, and if the mouse
 // position overlaps the window, scroll it.
 - (void)addOrUpdateScrollTracking {
   [self removeScrollTracking];
   NSView* view = [[self window] contentView];
-  scrollTrackingArea_.reset([[NSTrackingArea alloc]
+  scrollTrackingArea_.reset([[CrTrackingArea alloc]
                               initWithRect:[view bounds]
                                    options:(NSTrackingMouseMoved |
                                             NSTrackingMouseEnteredAndExited |
                                             NSTrackingActiveAlways)
-                                     owner:self
+                              proxiedOwner:self
                                   userInfo:nil]);
-    [view addTrackingArea:scrollTrackingArea_];
+  [scrollTrackingArea_ clearOwnerWhenWindowWillClose:[self window]];
+  [view addTrackingArea:scrollTrackingArea_];
 }
 
 // Remove the tracking area associated with scrolling.
 - (void)removeScrollTracking {
   if (scrollTrackingArea_.get()) {
     [[[self window] contentView] removeTrackingArea:scrollTrackingArea_];
   }
   scrollTrackingArea_.reset();
 }
 
@@ skipping 705 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController