[Mac] Fix for incorrect bookmark bar hover state

Currently if you click on an item in the bookmark
bar, the item will lose its highlight state.

This CL makes sure it retains it by updating the
highlight on a mouse up.

Testing:
Unit test BookmarkButtonTest.MouseUpAndDownHighlight

Bug: 613208
Change-Id: I2a3063af49065d3e985f681f69b0978666455243
Reviewed-on: https://chromium-review.googlesource.com/804695Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Sarah Chan <spqchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522141}

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

@@ -369,6 +369,15 @@ BookmarkButton* gDraggedButton = nil; // Weak
     [id(delegate_) mouseDragged:theEvent];
 }
 
+- (void)mouseUp:(NSEvent*)theEvent {
+  [super mouseUp:theEvent];
+
+  // Update the highlight on mouse up.
+  GradientButtonCell* cell =
+      base::mac::ObjCCastStrict<GradientButtonCell>([self cell]);
+  [cell setMouseInside:[cell isMouseReallyInside] animate:NO];
+}
+
 - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event {
   // Ensure that right-clicking on a button while a context menu is already open
   // highlights the new button.

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

@@ -133,6 +133,36 @@ TEST_F(BookmarkButtonTest, MouseEnterExitRedirect) {
   EXPECT_EQ(2, delegate.get()->exited_);
 }
 
+// Tests to see if the bookmark button is properly highlighted on mouse up/down
+// events.
+TEST_F(BookmarkButtonTest, MouseUpAndDownHighlight) {
+  NSEvent* moveEvent = cocoa_test_event_utils::MouseEventAtPoint(
+      NSMakePoint(510, 510), NSMouseMoved, 0);
+  base::scoped_nsobject<BookmarkButton> button;
+  base::scoped_nsobject<BookmarkButtonCell> cell;
+  base::scoped_nsobject<FakeButtonDelegate> delegate(
+      [[FakeButtonDelegate alloc] init]);
+  button.reset(
+      [[BookmarkButton alloc] initWithFrame:NSMakeRect(0, 0, 500, 500)]);
+  cell.reset([[BookmarkButtonCell alloc] initTextCell:@"nightjar"]);
+  [button setCell:cell];
+  [button setDelegate:delegate];
+  [cell updateTrackingAreas];
+
+  EXPECT_FALSE([cell isMouseInside]);
+
+  moveEvent = cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(10, 10),
+                                                        NSMouseMoved, 0);
+  [cell mouseEntered:moveEvent];
+  EXPECT_TRUE([cell isMouseInside]);
+
+  [button mouseDown:moveEvent];
+  EXPECT_TRUE([cell isMouseInside]);
+
+  [button mouseUp:moveEvent];
+  EXPECT_EQ([cell isMouseReallyInside], [cell isMouseInside]);
+}
+
 TEST_F(BookmarkButtonTest, DragToTrash) {
   base::scoped_nsobject<BookmarkButton> button;
   base::scoped_nsobject<BookmarkButtonCell> cell;

chrome/browser/ui/cocoa/gradient_button_cell.h

@@ -129,6 +129,7 @@ typedef enum {
 - (BOOL)pulsing;
 - (gradient_button_cell::PulseState)pulseState;
 - (void)setPulseState:(gradient_button_cell::PulseState)pstate;
+- (void)updateTrackingAreas;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_GRADIENT_BUTTON_CELL_H_