Remove ScopedVector from chrome/browser/ui.

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 20 matching lines @@
 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(
     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 =
+  const ToolbarActionsBar::ToolbarActions& 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;
@@ skipping 522 matching lines @@
       extensions::extension_action_test_util::BROWSER_ACTION);
   toolbar_model()->SetVisibleIconCount(0u);
   {
     base::RunLoop run_loop;
     toolbar_actions_bar()->PopOutAction(action, true, run_loop.QuitClosure());
     run_loop.Run();
   }
   EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
   EXPECT_TRUE(toolbar_actions_bar()->NeedsOverflow());
 }