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

chrome/browser/ui/toolbar/toolbar_actions_bar_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 "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 406 matching lines @@
   CreateAndAddExtension("extension",
                         extensions::extension_action_test_util::NO_ACTION);
   EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
       profile()));
 
   // If the bubble was recently shown, we shouldn't show it again...
   scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble_delegate(
       new ExtensionToolbarIconSurfacingBubbleDelegate(profile()));
   bubble_delegate->OnBubbleShown();
   bubble_delegate->OnBubbleClosed(
-      ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
+      ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION);
   EXPECT_FALSE(
     ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
         profile()));
 
   // ...But if it was only dismissed, we should show it before too long.
   base::Time two_days_ago = base::Time::Now() - base::TimeDelta::FromDays(2);
   prefs->SetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime,
                   two_days_ago.ToInternalValue());
   EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
       profile()));
@@ skipping 120 matching lines @@
   // Set the width back to the preferred width. All should be back to normal.
   browser_action_test_util()->SetWidth(
       toolbar_actions_bar()->GetPreferredSize().width());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
   EXPECT_EQ(0u, toolbar_actions_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetEndIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetEndIndexInBounds());
   EXPECT_FALSE(toolbar_actions_bar()->NeedsOverflow());
 }