Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc

Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
index 856a38f5c94aa4cf636199390cc2ce18b5fb72f7..35ffdb42217934ddc050cb976b03bf0ef84d6221 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
@@ -3,10 +3,13 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
+
 #include "base/macros.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+#include "chrome/test/base/browser_with_test_window_test.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
@@ -22,8 +25,13 @@ class ComponentToolbarActionsFactoryTest
   void SetUp() override {
     extensions::ExtensionServiceTestBase::SetUp();
     InitializeEmptyExtensionService();
+    actions_factory_ =
+        extensions::extension_action_test_util::
+            CreateToolbarModelForProfileWithoutWaitingForReady(profile())
+                ->component_actions_factory();
   }
 
+ protected:
   scoped_refptr<const extensions::Extension> CreateExtensionWithId(
       const std::string& extension_id) {
     extensions::DictionaryBuilder manifest;
@@ -47,11 +55,12 @@ class ComponentToolbarActionsFactoryTest
       scoped_refptr<const extensions::Extension> extension) {
     service()->AddExtension(extension.get());
     CHECK(registry()->enabled_extensions().Contains(extension->id()));
-    ComponentToolbarActionsFactory::GetInstance()->UnloadMigratedExtensions(
-        service(), registry());
+    actions_factory_->UnloadMigratedExtensions(service(), registry());
     return !registry()->enabled_extensions().Contains(extension->id());
   }
 
+  ComponentToolbarActionsFactory* actions_factory_ = nullptr;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsFactoryTest);
 };
@@ -66,3 +75,20 @@ TEST_F(ComponentToolbarActionsFactoryTest, UnloadMigratedExtensions) {
           "not_migrated_extension",
           extensions::extension_action_test_util::BROWSER_ACTION)));
 }
+
+TEST_F(ComponentToolbarActionsFactoryTest, GetInitialIds) {
+  std::string id1("id1");
+  std::string id2("id2");
+  std::string id3("id3");
+
+  actions_factory_->OnAddComponentActionBeforeInit(id1);
+  actions_factory_->OnAddComponentActionBeforeInit(id2);
+  actions_factory_->OnAddComponentActionBeforeInit(id3);
+  actions_factory_->OnRemoveComponentActionBeforeInit(id2);
+
+  std::set<std::string> initial_ids =
+      actions_factory_->GetInitialComponentIds();
+  EXPECT_TRUE(base::ContainsKey(initial_ids, id1));
+  EXPECT_FALSE(base::ContainsKey(initial_ids, id2));
+  EXPECT_TRUE(base::ContainsKey(initial_ids, id3));
+}