Add infrastructure for Chrome Actions

chrome/browser/extensions/extension_toolbar_model_unittest.cc

 // Copyright 2014 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 "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
@@ skipping 314 matching lines @@
   scoped_refptr<const Extension> extension2 =
       GetActionExtension("browser_action", manifest_keys::kBrowserAction);
   ASSERT_TRUE(AddExtension(extension2));
 
   // We should now find our extension in the model.
   EXPECT_EQ(1u, observer()->inserted_count());
   EXPECT_EQ(1u, num_toolbar_items());
   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));
 
   // Remove the extension and verify.
   ASSERT_TRUE(RemoveExtension(extension2));
   EXPECT_EQ(1u, observer()->removed_count());
   EXPECT_EQ(0u, num_toolbar_items());
   EXPECT_EQ(NULL, GetExtensionAtIndex(0u));
 }
 
 // Test various different reorderings, removals, and reinsertions.
 TEST_F(ExtensionToolbarModelUnitTest, ExtensionToolbarReorderAndReinsert) {
   Init();
 
   // Add the three browser action extensions.
   ASSERT_TRUE(AddBrowserActionExtensions());
 
   // Verify the three extensions are in the model in the proper order.
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   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));
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(1u));
   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));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(2u));
 
   // Order is now C, B, A. Let's remove B.
   ASSERT_TRUE(RemoveExtension(browser_action_b()));
   EXPECT_EQ(1u, observer()->removed_count());
   EXPECT_EQ(2u, num_toolbar_items());
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(1u));
 
   // Load extension B again.
   ASSERT_TRUE(AddExtension(browser_action_b()));
 
   // Extension B loaded again.
   EXPECT_EQ(4u, observer()->inserted_count());
   EXPECT_EQ(3u, num_toolbar_items());
   // Make sure it gets its old spot in the list.
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
 
   // Unload B again.
   ASSERT_TRUE(RemoveExtension(browser_action_b()));
   EXPECT_EQ(2u, observer()->removed_count());
   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));
 
   // Order is now A, C. Remove C.
   ASSERT_TRUE(RemoveExtension(browser_action_c()));
   EXPECT_EQ(3u, observer()->removed_count());
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
 
@@ skipping 49 matching lines @@
   service()->EnableExtension(browser_action_c()->id());
   service()->EnableExtension(browser_action_a()->id());
   service()->EnableExtension(browser_action_b()->id());
 
   // Make sure we still get the original A, B, C order.
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(1u));
   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.
   service()->UninstallExtension(browser_action_b()->id(),
                                 UNINSTALL_REASON_FOR_TESTING,
                                 base::Bind(&base::DoNothing),
                                 NULL);  // Ignore error.
   // List contains only A and C now. Validate that.
   EXPECT_EQ(2u, num_toolbar_items());
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
@@ skipping 297 matching lines @@
   // Give two extensions incognito access.
   // Note: We use ExtensionPrefs::SetIsIncognitoEnabled instead of
   // util::SetIsIncognitoEnabled because the latter tries to reload the
   // extension, which can cause problems in our unittest set up (and reloading
   // the extension is irrelevant to us).
   ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile());
   extension_prefs->SetIsIncognitoEnabled(browser_action_b()->id(), true);
   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());
 
   // Get an incognito profile and toolbar.
   ExtensionToolbarModel* incognito_model =
       CreateToolbarModelForProfile(profile()->GetOffTheRecordProfile());
 
   ExtensionToolbarModelTestObserver incognito_observer(incognito_model);
   EXPECT_EQ(0u, incognito_observer.moved_count());
@@ skipping 15 matching lines @@
   EXPECT_EQ(0, incognito_model->GetVisibleIconCount());
   EXPECT_EQ(2, toolbar_model()->GetVisibleIconCount());
 
   // Expanding the incognito model to 2 should register as "all icons" (-1),
   // since it is all of the incognito-enabled extensions.
   incognito_model->SetVisibleIconCount(2u);
   EXPECT_EQ(-1, incognito_model->GetVisibleIconCount());
 
   // 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));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(1u, incognito_model));
   // ... and the regular toolbar should be unaffected.
   EXPECT_EQ(browser_action_a(), GetExtensionAtIndex(0u));
   EXPECT_EQ(browser_action_c(), GetExtensionAtIndex(1u));
   EXPECT_EQ(browser_action_b(), GetExtensionAtIndex(2u));
 
   // Similarly, the observer for the regular model should not have received
   // any updates.
   EXPECT_EQ(1u, observer()->moved_count());
 
   // 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());
 }
 
 // Test that hiding actions on the toolbar results in sending them to the
 // overflow menu when the redesign switch is enabled.
 TEST_F(ExtensionToolbarModelUnitTest,
        ExtensionToolbarActionsVisibilityWithSwitch) {
   FeatureSwitch::ScopedOverride enable_redesign(
       FeatureSwitch::extension_action_redesign(), true);
@@ skipping 63 matching lines @@
   ExtensionActionAPI::SetBrowserActionVisibility(
       prefs, extension_b->id(), true);
   EXPECT_EQ(3u, num_toolbar_items());
   EXPECT_EQ(-1, toolbar_model()->GetVisibleIconCount());  // -1 = 'all'
   EXPECT_EQ(extension_c, GetExtensionAtIndex(0u));
   EXPECT_EQ(extension_a, GetExtensionAtIndex(1u));
   EXPECT_EQ(extension_b, GetExtensionAtIndex(2u));
 }
 
 }  // namespace extensions