Revert of [Extensions] Don't count bubble dismissal from focus loss as acknowledgment

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm

 // Copyright 2015 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 "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
@@ skipping 99 matching lines @@
   base::scoped_nsobject<WindowObserver> windowObserver(
       [[WindowObserver alloc] initWithWindow:[bubble window]]);
   EXPECT_FALSE([windowObserver windowIsClosing]);
 
   // Find the appropriate button to click.
   NSButton* button = nil;
   switch (expected_action) {
     case ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE:
       button = [bubble actionButton];
       break;
-    case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION:
+    case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS:
       button = [bubble dismissButton];
       break;
     case ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE:
       button = [bubble learnMoreButton];
       break;
-    case ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION:
-      NOTREACHED();  // Deactivation is tested below.
-      break;
   }
   ASSERT_TRUE(button);
 
   // Click the button.
   std::pair<NSEvent*, NSEvent*> events =
       cocoa_test_event_utils::MouseClickInView(button, 1);
   [NSApp postEvent:events.second atStart:YES];
   [NSApp sendEvent:events.first];
   chrome::testing::NSRunLoopRunAllPending();
 
   // The bubble should be closed, and the delegate should be told that the
   // button was clicked.
   ASSERT_TRUE(delegate.close_action());
   EXPECT_EQ(expected_action, *delegate.close_action());
   EXPECT_TRUE([windowObserver windowIsClosing]);
 }
 
 // Test clicking on the action button and dismissing the bubble.
 TEST_F(ToolbarActionsBarBubbleMacTest, CloseActionAndDismiss) {
   // Test all the possible actions.
   TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
-  TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
+  TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
   TestBubbleButton(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
 
   {
     // Test dismissing the bubble without clicking the button.
     TestToolbarActionsBarBubbleDelegate delegate(
         HeadingString(), BodyString(), ActionString());
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     base::scoped_nsobject<WindowObserver> windowObserver(
         [[WindowObserver alloc] initWithWindow:[bubble window]]);
     EXPECT_FALSE([windowObserver windowIsClosing]);
 
     // Close the bubble. The delegate should be told it was dismissed.
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
     ASSERT_TRUE(delegate.close_action());
-    EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION,
+    EXPECT_EQ(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS,
               *delegate.close_action());
     EXPECT_TRUE([windowObserver windowIsClosing]);
   }
 }
 
 // Test the basic layout of the bubble.
 TEST_F(ToolbarActionsBarBubbleMacTest, ToolbarActionsBarBubbleLayout) {
   // Test with no optional fields.
   {
     TestToolbarActionsBarBubbleDelegate delegate(
@@ skipping 64 matching lines @@
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
     EXPECT_TRUE([bubble learnMoreButton]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 }