[Extension Toolbar] Slide out overflowed actions for popups

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"
@@ skipping 21 matching lines @@
 
 // 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(
     const ToolbarActionsBar* actions_bar,
     BrowserActionTestUtil* browser_action_test_util,
     const char* expected_names[],
     size_t total_size,
     size_t visible_count) {
   const std::vector<ToolbarActionViewController*>& toolbar_actions =
-      actions_bar->toolbar_actions();
+      actions_bar->toolbar_actions_unordered();
   // If the total size is wrong, we risk segfaulting by continuing. Abort now.
   if (total_size != toolbar_actions.size()) {
     return base::StringPrintf("Incorrect action count: expected %d, found %d",
                               static_cast<int>(total_size),
                               static_cast<int>(toolbar_actions.size()));
   }
 
   // Check that the ToolbarActionsBar matches the expected state.
   std::string error;
   for (size_t i = 0; i < total_size; ++i) {
@@ skipping 335 matching lines @@
   const char kExtension0[] = "extension 0";
   const char kExtension1[] = "extension 1";
   const char kExtension2[] = "extension 2";
   {
     // The order should start as 0, 1, 2.
     const char* expected_names[] = { kExtension0, kExtension1, kExtension2 };
     EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
   }
 
   extensions::ExtensionIdList new_order;
-  new_order.push_back(toolbar_actions_bar()->toolbar_actions()[1]->GetId());
-  new_order.push_back(toolbar_actions_bar()->toolbar_actions()[2]->GetId());
+  new_order.push_back(toolbar_actions_bar()->toolbar_actions_unordered()[1]->
+      GetId());
+  new_order.push_back(toolbar_actions_bar()->toolbar_actions_unordered()[2]->
+      GetId());
   extensions::ExtensionPrefs::Get(profile())->SetToolbarOrder(new_order);
 
   {
     // The order should now reflect the prefs, and be 1, 2, 0.
     const char* expected_names[] = { kExtension1, kExtension2, kExtension0 };
     EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
   }
 }
 
 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest {
@@ skipping 47 matching lines @@
       ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   EXPECT_FALSE(
       ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
           profile()));
   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));
 }