[Reland][Extensions] Don't count bubble focus loss as acknowledgment

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

 // Copyright 2014 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/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
@@ skipping 1211 matching lines @@
   EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
       profile()));
   EXPECT_TRUE(toolbar_model->is_highlighting());
   EXPECT_EQ(ToolbarActionsModel::HIGHLIGHT_INFO,
             toolbar_model->highlight_type());
   EXPECT_EQ(3u, toolbar_model->visible_icon_count());
   EXPECT_EQ(3u, toolbar_model->toolbar_items().size());
 
   scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble(
       new ExtensionToolbarIconSurfacingBubbleDelegate(profile()));
-  bubble->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
+  bubble->OnBubbleClosed(
+      ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
 
   EXPECT_FALSE(toolbar_model->is_highlighting());
   EXPECT_EQ(ToolbarActionsModel::HIGHLIGHT_NONE,
             toolbar_model->highlight_type());
 }
 
 // Test various different reorderings, removals, and reinsertions of the
 // toolbar with component actions.
 TEST_F(ToolbarActionsModelUnitTest,
        ActionsToolbarReorderAndReinsertWithSwitchAndComponentActions) {
@@ skipping 91 matching lines @@
   EXPECT_EQ(component_action_id(), GetActionIdAtIndex(0u));
 
   // Load extension C again.
   ASSERT_TRUE(AddExtension(browser_action_c()));
   EXPECT_EQ(4u, observer()->inserted_count());
   EXPECT_EQ(2u, num_toolbar_items());
   // Make sure it gets its old spot in the list (at the beginning).
   EXPECT_EQ(browser_action_c()->id(), GetActionIdAtIndex(0u));
   EXPECT_EQ(component_action_id(), GetActionIdAtIndex(1u));
 }