[Extensions] Add logic for when to show the toolbar redesign bubble.

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.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_helper.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
 
 // Verifies that the toolbar order matches for the given |actions_bar|. If the
 // order matches, the return value is empty; otherwise, it contains the error.
 std::string VerifyToolbarOrderForBar(
@@ skipping 348 matching lines @@
   EXPECT_EQ(2u, toolbar_actions_bar()->GetIconCount());
 
   // If we shrink the bar so that a full icon can't fit, it should resize to
   // hide that icon.
   toolbar_actions_bar()->OnResizeComplete(width - 1);
   width -= ToolbarActionsBar::IconWidth(true);
   EXPECT_EQ(width, toolbar_actions_bar()->GetPreferredSize().width());
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
 }
 
+class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest {
+ public:
+  ToolbarActionsBarRedesignUnitTest() : ToolbarActionsBarUnitTest(true) {}
+  ~ToolbarActionsBarRedesignUnitTest() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest);
+};
+
+TEST_F(ToolbarActionsBarRedesignUnitTest, IconSurfacingBubbleAppearance) {
+  // Without showing anything new, we shouldn't show the bubble, and should
+  // auto-acknowledge it.
+  PrefService* prefs = profile()->GetPrefs();
+//  ToolbarActionsBar::RegisterPrefs(prefs);

[battre, 2015/03/19 09:28:45]

indenting / should this be commented out?

[Devlin, 2015/03/19 16:28:08]

Done.

+  EXPECT_FALSE(toolbar_actions_bar()->ShouldShowInfoBubble());
+  EXPECT_TRUE(
+      prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged));
+
+  // Clear the pref for testing, and add an extension that wouldn't normally
+  // have an icon. We should now show the bubble.
+  prefs->ClearPref(prefs::kToolbarIconSurfacingBubbleAcknowledged);
+  CreateAndAddExtension("extension",
+                        extensions::extension_action_test_util::NO_ACTION);
+  EXPECT_TRUE(toolbar_actions_bar()->ShouldShowInfoBubble());
+
+  // If the bubble was recently shown, we shouldn't show it again...
+  ToolbarActionsBarBubbleDelegate* bubble_delegate =
+      static_cast<ToolbarActionsBarBubbleDelegate*>(toolbar_actions_bar());
+  bubble_delegate->OnToolbarActionsBarBubbleShown();
+  bubble_delegate->OnToolbarActionsBarBubbleClosed(
+      ToolbarActionsBarBubbleDelegate::DISMISSED);
+  EXPECT_FALSE(toolbar_actions_bar()->ShouldShowInfoBubble());
+
+  // ...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(toolbar_actions_bar()->ShouldShowInfoBubble());
+
+  // If it's acknowledged, then it should never show again, and should be
+  // recorded as acknowledged.
+  bubble_delegate->OnToolbarActionsBarBubbleShown();
+  bubble_delegate->OnToolbarActionsBarBubbleClosed(
+      ToolbarActionsBarBubbleDelegate::ACKNOWLEDGED);
+  EXPECT_FALSE(toolbar_actions_bar()->ShouldShowInfoBubble());
+  base::Time one_week_ago = base::Time::Now() - base::TimeDelta::FromDays(7);
+  prefs->SetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime,
+                  one_week_ago.ToInternalValue());
+  EXPECT_TRUE(
+      prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged));
+}
+
 class ToolbarActionsBarPopOutUnitTest
-     : public ToolbarActionsBarUnitTest {
+    : public ToolbarActionsBarRedesignUnitTest {
  public:
-  ToolbarActionsBarPopOutUnitTest() : ToolbarActionsBarUnitTest(true) {}
+  ToolbarActionsBarPopOutUnitTest() {}
 
  protected:
   void SetUp() override {
     ToolbarActionsBar::set_pop_out_actions_to_run_for_testing(true);
     ToolbarActionsBarUnitTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarPopOutUnitTest);
 };
@@ skipping 275 matching lines @@
     EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
     // Move "page action" to the overflow menu.
     toolbar_actions_bar()->OnDragDrop(
         0, 2, ToolbarActionsBar::DRAG_TO_OVERFLOW);
     const char* expected_names2[] = { kBrowserAction, kSynthetic, kPageAction };
     EXPECT_TRUE(VerifyToolbarOrder(expected_names2, 3u, 2u));
     SetActionWantsToRunOnTab(action, web_contents, false);
     EXPECT_TRUE(VerifyToolbarOrder(expected_names2, 3u, 2u));
   }
 }