Add infrastructure for Chrome Actions

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 c84bad697ad3f6112a1f34e7df9e72fff6defc4a..4b65fd32452175f142e0ed52eb7a195c308e5c54 100644
--- a/chrome/browser/extensions/extension_toolbar_model_unittest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_unittest.cc
@@ -332,7 +332,7 @@ TEST_F(ExtensionToolbarModelUnitTest, BasicExtensionToolbarModelTest) {
   EXPECT_EQ(extension2.get(), GetExtensionAtIndex(0u));
 
   // Should be a no-op, but still fires the events.
-  toolbar_model()->MoveExtensionIcon(extension2.get(), 0);
+  toolbar_model()->MoveExtensionIcon(extension2->id(), 0);
   EXPECT_EQ(1u, observer()->moved_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(extension2.get(), GetExtensionAtIndex(0u));
@@ -358,7 +358,7 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarReorderAndReinsert) {
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2u));
 
   // Order is now A, B, C. Let's put C first.
-  toolbar_model()->MoveExtensionIcon(browser_action_c(), 0);
+  toolbar_model()->MoveExtensionIcon(browser_action_c()->id(), 0);
   EXPECT_EQ(1u, observer()->moved_count());
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(0u));
@@ -366,7 +366,7 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarReorderAndReinsert) {
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(2u));
 
   // Order is now C, A, B. Let's put A last.
-  toolbar_model()->MoveExtensionIcon(browser_action_a(), 2);
+  toolbar_model()->MoveExtensionIcon(browser_action_a()->id(), 2);
   EXPECT_EQ(2u, observer()->moved_count());
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(0u));
@@ -395,13 +395,13 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarReorderAndReinsert) {
   EXPECT_EQ(2u, num_toolbar_items());
 
   // Order is now C, A. Flip it.
-  toolbar_model()->MoveExtensionIcon(browser_action_a(), 0);
+  toolbar_model()->MoveExtensionIcon(browser_action_a()->id(), 0);
   EXPECT_EQ(3u, observer()->moved_count());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(1u));
 
   // Move A to the location it already occupies.
-  toolbar_model()->MoveExtensionIcon(browser_action_a(), 0);
+  toolbar_model()->MoveExtensionIcon(browser_action_a()->id(), 0);
   EXPECT_EQ(4u, observer()->moved_count());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(1u));
@@ -471,7 +471,7 @@ TEST_F(ExtensionToolbarModelUnitTest,
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(2u));
 
   // Move browser_action_b() to be first.
-  toolbar_model()->MoveExtensionIcon(browser_action_b(), 0);
+  toolbar_model()->MoveExtensionIcon(browser_action_b()->id(), 0);
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(0u));
 
   // Uninstall Extension B.
@@ -789,7 +789,7 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarIncognitoModeTest) {
   extension_prefs->SetIsIncognitoEnabled(browser_action_c()->id(), true);
 
   // Move C to the second index.
-  toolbar_model()->MoveExtensionIcon(browser_action_c(), 1u);
+  toolbar_model()->MoveExtensionIcon(browser_action_c()->id(), 1u);
   // Set visible count to 2 so that c is overflowed. State is A C [B].
   toolbar_model()->SetVisibleIconCount(2);
   EXPECT_EQ(1u, observer()->moved_count());
@@ -825,7 +825,7 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarIncognitoModeTest) {
 
   // Moving icons in the incognito toolbar should not affect the regular
   // toolbar. Incognito currently has C B...
-  incognito_model->MoveExtensionIcon(browser_action_b(), 0u);
+  incognito_model->MoveExtensionIcon(browser_action_b()->id(), 0u);
   // So now it should be B C...
   EXPECT_EQ(1u, incognito_observer.moved_count());
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(0u, incognito_model));
@@ -841,7 +841,7 @@ TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarIncognitoModeTest) {
 
   // And performing moves on the regular model should have no effect on the
   // incognito model or its observers.
-  toolbar_model()->MoveExtensionIcon(browser_action_c(), 2u);
+  toolbar_model()->MoveExtensionIcon(browser_action_c()->id(), 2u);
   EXPECT_EQ(2u, observer()->moved_count());
   EXPECT_EQ(1u, incognito_observer.moved_count());
 }