Support Component Actions in the toolbar.

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 302 matching lines @@
   // Test drag-and-drop logic.
   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;
+  std::vector<std::string> new_order;
   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));
@@ skipping 107 matching lines @@
   EXPECT_EQ(gfx::Rect(kSpacing, kIconHeight, kIconWidth, kIconHeight),
             overflow_bar()->GetFrameForIndex(6));
 
   // Check with > 2 rows.
   toolbar_model()->SetVisibleIconCount(0);
   EXPECT_EQ(gfx::Rect(kSpacing, 0, kIconWidth, kIconHeight),
             overflow_bar()->GetFrameForIndex(0));
   EXPECT_EQ(gfx::Rect(kSpacing, kIconHeight * 2, kIconWidth, kIconHeight),
             overflow_bar()->GetFrameForIndex(6));
 }