Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6af67eba81f4670621d6cd545df6f11c29054cf8
--- /dev/null
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
@@ -0,0 +1,35 @@
+// Copyright 2015 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/mock_component_toolbar_actions_factory.h"
+
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
+
+MockComponentToolbarActionsFactory::MockComponentToolbarActionsFactory(
+    Browser* browser) {
+  ComponentToolbarActionsFactory::SetTestingFactory(this);
+
+  ScopedVector<ToolbarActionViewController> actions =
+      GetComponentToolbarActions(browser);
+  for (auto it = actions.begin(); it != actions.end(); ++it) {

[Peter Kasting, 2015/08/06 20:15:17]

Nit: Use range-based for

[apacible, 2015/08/10 22:38:11]

Done.

+    action_ids_.push_back((*it)->GetId());
+  }
+}
+
+MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
+  ComponentToolbarActionsFactory::SetTestingFactory(nullptr);
+}
+
+ScopedVector<ToolbarActionViewController>
+MockComponentToolbarActionsFactory::GetComponentToolbarActions(
+    Browser* browser) {
+  ScopedVector<ToolbarActionViewController> component_actions;
+  TestToolbarActionViewController* action =

[Peter Kasting, 2015/08/06 20:15:17]

Nit: I try to avoid ever using raw pointers to own objects; I'd prefer to either
inline this call into the push_back() below, or else use a scoped_ptr here with
release() in the next call.

(Since Chromium doesn't support exceptions this is not really a huge correctness
issue but it's nice to just be in the habit of safe code.)

[apacible, 2015/08/10 22:38:11]

Done.

+      new TestToolbarActionViewController(
+          ComponentToolbarActionsFactory::kActionIdForTest);
+  component_actions.push_back(action);
+  return component_actions.Pass();
+}