Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..e113d830fa1223f0dc4e7de72f328262b7fc3cc7
--- /dev/null
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
@@ -0,0 +1,33 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_TOOLBAR_MOCK_COMPONENT_TOOLBAR_ACTIONS_FACTORY_H_
+#define CHROME_BROWSER_UI_TOOLBAR_MOCK_COMPONENT_TOOLBAR_ACTIONS_FACTORY_H_
+
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+
+class Browser;
+
+// Mock class used to substitute ComponentToolbarActionsFactory in tests.
+class MockComponentToolbarActionsFactory
+    : public ComponentToolbarActionsFactory {
+ public:
+  explicit MockComponentToolbarActionsFactory(Browser* browser);
+  virtual ~MockComponentToolbarActionsFactory();

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

Nit: Use override instead of virtual for destructors in non-base classes

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

Done. Also updated ComponentToolbarActionsFactory destructor to be virtual.

+
+  // ComponentToolbarActionsFactory:
+  ScopedVector<ToolbarActionViewController>
+      GetComponentToolbarActions(Browser* browser) override;
+
+  const ActionIdList action_ids() const { return action_ids_; }
+
+ private:
+  // A set of all action ids of created actions.

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

Nit: This type isn't actually a set, so don't use the word "set".

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

Done.

+  ActionIdList action_ids_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockComponentToolbarActionsFactory);
+};
+
+#endif  // CHROME_BROWSER_UI_TOOLBAR_MOCK_COMPONENT_TOOLBAR_ACTIONS_FACTORY_H_