Add infrastructure for Chrome Actions

chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 223 matching lines @@
   Browser* second_browser = new Browser(
       Browser::CreateParams(profile(), browser()->host_desktop_type()));
   BrowserActionsContainer* second =
       BrowserView::GetBrowserViewForBrowser(second_browser)->toolbar()->
           browser_actions();
 
   // Both containers should have the same order and visible actions, which
   // is right now A B C.
   EXPECT_EQ(3u, first->VisibleBrowserActions());
   EXPECT_EQ(3u, second->VisibleBrowserActions());
-  EXPECT_EQ(extension_a(), first->GetBrowserActionViewAt(0u)->extension());
-  EXPECT_EQ(extension_a(), second->GetBrowserActionViewAt(0u)->extension());
-  EXPECT_EQ(extension_b(), first->GetBrowserActionViewAt(1u)->extension());
-  EXPECT_EQ(extension_b(), second->GetBrowserActionViewAt(1u)->extension());
-  EXPECT_EQ(extension_c(), first->GetBrowserActionViewAt(2u)->extension());
-  EXPECT_EQ(extension_c(), second->GetBrowserActionViewAt(2u)->extension());
+  EXPECT_EQ(extension_a()->id(), first->GetIdAt(0u));
+  EXPECT_EQ(extension_a()->id(), second->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), first->GetIdAt(1u));
+  EXPECT_EQ(extension_b()->id(), second->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), first->GetIdAt(2u));
+  EXPECT_EQ(extension_c()->id(), second->GetIdAt(2u));
 
   // Simulate a drag and drop to the right.
   ui::OSExchangeData drop_data;
   // Drag extension A from index 0...
   BrowserActionDragData browser_action_drag_data(extension_a()->id(), 0u);
   browser_action_drag_data.Write(profile(), &drop_data);
   BrowserActionView* view = first->GetViewForExtension(extension_b());
   // ...to the right of extension B.
   gfx::Point location(view->x() + view->width(), view->y());
   ui::DropTargetEvent target_event(
       drop_data, location, location, ui::DragDropTypes::DRAG_MOVE);
 
   // Drag and drop.
   first->OnDragUpdated(target_event);
   first->OnPerformDrop(target_event);
 
   // The new order, B A C, should be reflected in *both* containers, even
   // though the drag only happened in the first one.
-  EXPECT_EQ(extension_b(), first->GetBrowserActionViewAt(0u)->extension());
-  EXPECT_EQ(extension_b(), second->GetBrowserActionViewAt(0u)->extension());
-  EXPECT_EQ(extension_a(), first->GetBrowserActionViewAt(1u)->extension());
-  EXPECT_EQ(extension_a(), second->GetBrowserActionViewAt(1u)->extension());
-  EXPECT_EQ(extension_c(), first->GetBrowserActionViewAt(2u)->extension());
-  EXPECT_EQ(extension_c(), second->GetBrowserActionViewAt(2u)->extension());
+  EXPECT_EQ(extension_b()->id(), first->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), second->GetIdAt(0u));
+  EXPECT_EQ(extension_a()->id(), first->GetIdAt(1u));
+  EXPECT_EQ(extension_a()->id(), second->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), first->GetIdAt(2u));
+  EXPECT_EQ(extension_c()->id(), second->GetIdAt(2u));
 
   // Next, simulate a resize by shrinking the container.
   first->OnResize(1, true);
   // The first and second container should each have resized.
   EXPECT_EQ(2u, first->VisibleBrowserActions());
   EXPECT_EQ(2u, second->VisibleBrowserActions());
 }
 
 // Test that the BrowserActionsContainer responds correctly when the underlying
 // model enters highlight mode, and that browser actions are undraggable in
@@ skipping 108 matching lines @@
   overflow_bar_.reset();
   enable_redesign_.reset();
   BrowserActionsBarBrowserTest::TearDownOnMainThread();
 }
 
 bool BrowserActionsContainerOverflowTest::ViewOrdersMatch() {
   if (main_bar_->num_browser_actions() !=
       overflow_bar_->num_browser_actions())
     return false;
   for (size_t i = 0; i < main_bar_->num_browser_actions(); ++i) {
-    if (main_bar_->GetBrowserActionViewAt(i)->extension() !=
-        overflow_bar_->GetBrowserActionViewAt(i)->extension())
+    if (main_bar_->GetIdAt(i) != overflow_bar_->GetIdAt(i))
       return false;
   }
   return true;
 }
 
 testing::AssertionResult
 BrowserActionsContainerOverflowTest::VerifyVisibleCount(
     size_t expected_visible) {
   // Views order should always match (as it is based directly off the model).
   if (!ViewOrdersMatch())
@@ skipping 21 matching lines @@
   LoadExtensions();
 
   // Since the overflow bar isn't attached to a view, we have to kick it in
   // order to retrigger layout each time we change the number of icons in the
   // bar.
   overflow_bar()->Layout();
 
   // All actions are showing, and are in the installation order.
   EXPECT_EQ(-1, model()->GetVisibleIconCount());
   ASSERT_EQ(3u, main_bar()->num_browser_actions());
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(2u));
   EXPECT_TRUE(VerifyVisibleCount(3u));
 
   // Reduce the visible count to 2. Order should be unchanged (A B C), but
   // only A and B should be visible on the main bar.
   model()->SetVisibleIconCount(2u);
   overflow_bar()->Layout();  // Kick.
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(2u));
   EXPECT_TRUE(VerifyVisibleCount(2u));
 
   // Move extension C to the first position. Order should now be C A B, with
   // C and A visible in the main bar.
-  model()->MoveExtensionIcon(extension_c(), 0);
+  model()->MoveExtensionIcon(extension_c()->id(), 0);
   overflow_bar()->Layout();  // Kick.
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u));
   EXPECT_TRUE(VerifyVisibleCount(2u));
 
   // Hide action A. This results in it being sent to overflow, and reducing the
   // visible size to 1, so the order should be C A B, with only C visible in the
   // main bar.
   extensions::ExtensionActionAPI::SetBrowserActionVisibility(
       extensions::ExtensionPrefs::Get(profile()),
       extension_a()->id(),
       false);
   overflow_bar()->Layout();  // Kick.
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u));
   EXPECT_TRUE(VerifyVisibleCount(1u));
 }
 
 // Test drag and drop between the overflow container and the main container.
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerOverflowTest,
                        TestOverflowDragging) {
   LoadExtensions();
 
   // Start with one extension in overflow.
   model()->SetVisibleIconCount(2u);
   overflow_bar()->Layout();
 
   // Verify starting state is A B [C].
   ASSERT_EQ(3u, main_bar()->num_browser_actions());
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(2u));
   EXPECT_TRUE(VerifyVisibleCount(2u));
 
   // Drag extension A (on the main bar) to the left of extension C (in
   // overflow).
   ui::OSExchangeData drop_data;
   BrowserActionDragData browser_action_drag_data(extension_a()->id(), 0u);
   browser_action_drag_data.Write(profile(), &drop_data);
   BrowserActionView* view = overflow_bar()->GetViewForExtension(extension_c());
   gfx::Point location(view->x(), view->y());
   ui::DropTargetEvent target_event(
       drop_data, location, location, ui::DragDropTypes::DRAG_MOVE);
 
   overflow_bar()->OnDragUpdated(target_event);
   overflow_bar()->OnPerformDrop(target_event);
   overflow_bar()->Layout();
 
   // Order should now be B [A C].
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(2u));
   VerifyVisibleCount(1u);
 
   // Drag extension A back from overflow to the main bar.
   ui::OSExchangeData drop_data2;
   BrowserActionDragData browser_action_drag_data2(extension_a()->id(), 1u);
   browser_action_drag_data2.Write(profile(), &drop_data2);
   view = main_bar()->GetViewForExtension(extension_b());
   location = gfx::Point(view->x(), view->y());
   ui::DropTargetEvent target_event2(
       drop_data2, location, location, ui::DragDropTypes::DRAG_MOVE);
 
   main_bar()->OnDragUpdated(target_event2);
   main_bar()->OnPerformDrop(target_event2);
 
   // Order should be A B [C] again.
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(2u));
   VerifyVisibleCount(2u);
 
   // Drag extension C from overflow to the main bar (before extension B).
   ui::OSExchangeData drop_data3;
   BrowserActionDragData browser_action_drag_data3(extension_c()->id(), 2u);
   browser_action_drag_data3.Write(profile(), &drop_data3);
   location = gfx::Point(view->x(), view->y());
   ui::DropTargetEvent target_event3(
       drop_data3, location, location, ui::DragDropTypes::DRAG_MOVE);
 
   main_bar()->OnDragUpdated(target_event3);
   main_bar()->OnPerformDrop(target_event3);
 
   // Order should be A C B, and there should be no extensions in overflow.
-  EXPECT_EQ(extension_a(), main_bar()->GetBrowserActionViewAt(0)->extension());
-  EXPECT_EQ(extension_c(), main_bar()->GetBrowserActionViewAt(1)->extension());
-  EXPECT_EQ(extension_b(), main_bar()->GetBrowserActionViewAt(2)->extension());
+  EXPECT_EQ(extension_a()->id(), main_bar()->GetIdAt(0u));
+  EXPECT_EQ(extension_c()->id(), main_bar()->GetIdAt(1u));
+  EXPECT_EQ(extension_b()->id(), main_bar()->GetIdAt(2u));
   VerifyVisibleCount(3u);
 }