[Extensions UI Mac] Fix a bug with popped out actions' highlighted state

chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.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.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
@@ skipping 259 matching lines @@
 }
 
 // Verifies that the action is "popped out" of overflow; that is, it is visible
 // on the main bar, and is set as the popped out action on the controlling
 // ToolbarActionsBar.
 void CheckActionIsPoppedOut(BrowserActionsController* actionsController,
                             BrowserActionButton* actionButton) {
   EXPECT_EQ([actionsController containerView], [actionButton superview]);
   EXPECT_EQ([actionButton viewController],
             [actionsController toolbarActionsBar]->popped_out_action());
+  // Since the button is popped out for a popup or context menu, it should be
+  // highlighted.
+  EXPECT_TRUE([actionButton isHighlighted]);
 }
 
 // Test that opening a context menu works for both actions on the main bar and
 // actions in the overflow menu.
 IN_PROC_BROWSER_TEST_F(BrowserActionButtonUiTest,
                        ContextMenusOnMainAndOverflow) {
   // Add an extension with a browser action.
   scoped_refptr<const extensions::Extension> extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "browser_action",
@@ skipping 24 matching lines @@
     // No menu should yet be open.
     EXPECT_FALSE([menuHelper menuOpened]);
     base::RunLoop runLoop;
     ui_controls::SendMouseEventsNotifyWhenDone(
         ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP,
         runLoop.QuitClosure());
     runLoop.Run();
     // The menu should have opened from the click.
     EXPECT_TRUE([menuHelper menuOpened]);
+    EXPECT_FALSE([actionButton isHighlighted]);
   }
 
   // Reset the menu helper so we can use it again.
   [menuHelper setMenuOpened:NO];
   [menuHelper setVerify:base::Bind(
       CheckActionIsPoppedOut, actionsController, actionButton)];
 
   // Shrink the visible count to be 0. This should hide the action button.
   model()->SetVisibleIconCount(0);
   EXPECT_EQ(nil, [actionButton superview]);
@@ skipping 15 matching lines @@
                    base::Unretained(toolbarController()),
                    runLoop.QuitClosure())];
     ui_controls::SendMouseEvents(ui_controls::LEFT,
                                  ui_controls::DOWN | ui_controls::UP);
     runLoop.Run();
 
     // The menu should have opened. Note that the menu opened on the main bar's
     // action button, not the overflow's. Since Cocoa doesn't support running
     // a menu-within-a-menu, this is what has to happen.
     EXPECT_TRUE([menuHelper menuOpened]);
+    EXPECT_FALSE([actionButton isHighlighted]);
   }
 }
 
 // Checks the layout of the overflow bar in the app menu.
 void CheckAppMenuLayout(ToolbarController* toolbarController,
                         int overflowStartIndex,
                         const std::string& error_message,
                         const base::Closure& closure) {
   AppMenuController* appMenuController =
       [toolbarController appMenuController];
@@ skipping 216 matching lines @@
   {
     EXPECT_FALSE([menuHelper menuOpened]);
     base::RunLoop runLoop;
     ui_controls::SendKeyPressNotifyWhenDone([actionButton window],
                                             ui::VKEY_SPACE, false, false, false,
                                             false, runLoop.QuitClosure());
     runLoop.Run();
     EXPECT_TRUE([menuHelper menuOpened]);
   }
 }