[Extensions Toolbar] Component extensions default to the front of the toolbar

chrome/browser/extensions/extension_toolbar_model_unittest.cc

Index: chrome/browser/extensions/extension_toolbar_model_unittest.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model_unittest.cc b/chrome/browser/extensions/extension_toolbar_model_unittest.cc
index c779b5558d597018d0df492b35a35e38939cf67e..5428d11d7e3ef8ebfa8f4b1f4a4a7b9b5bba69fe 100644
--- a/chrome/browser/extensions/extension_toolbar_model_unittest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_unittest.cc
@@ -28,7 +28,9 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_builder.h"
 #include "extensions/common/feature_switch.h"
+#include "extensions/common/value_builder.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
@@ -1129,4 +1131,33 @@ TEST_F(ExtensionToolbarModelUnitTest, ToolbarModelPrefChange) {
             observer()->inserted_count() - observer()->removed_count());
 }
 
+TEST_F(ExtensionToolbarModelUnitTest, ComponentExtesionsAddedToEnd) {
+  Init();
+
+  ASSERT_TRUE(AddBrowserActionExtensions());
+
+  EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0));
+  EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1));
+  EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2));
+
+  const char kName[] = "component";
+  DictionaryBuilder manifest;
+  manifest.Set("name", kName)
+          .Set("description", "An extension")
+          .Set("manifest_version", 2)
+          .Set("version", "1.0.0")
+          .Set("browser_action", DictionaryBuilder().Pass());
+  scoped_refptr<const Extension> component_extension =
+      ExtensionBuilder().SetManifest(manifest.Pass())
+                        .SetID(crx_file::id_util::GenerateId(kName))
+                        .SetLocation(Manifest::COMPONENT)
+                        .Build();
+  service()->AddExtension(component_extension.get());
+
+  EXPECT_EQ(component_extension.get(), GetExtensionAtIndex(0));
+  EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(1));
+  EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(2));
+  EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(3));
+}
+
 }  // namespace extensions