[Extensions Toolbar Mac] More cleanup of BrowserActionsController

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 213 matching lines @@
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   action_view = container->GetToolbarActionViewAt(0);
   EXPECT_TRUE(container->CanStartDragForView(action_view, point, point));
 }
 
 // Test the behavior of the overflow container for Extension Actions.
 class BrowserActionsContainerOverflowTest
     : public BrowserActionsBarBrowserTest {
  public:
-  BrowserActionsContainerOverflowTest() : main_bar_(NULL), model_(NULL) {
+  BrowserActionsContainerOverflowTest() : main_bar_(nullptr),
+                                          overflow_bar_(nullptr),
+                                          model_(nullptr) {
   }
   ~BrowserActionsContainerOverflowTest() override {}
 
  protected:
   // Returns true if the order of the ToolbarActionViews in |main_bar_|
   // and |overflow_bar_| match.
   bool ViewOrdersMatch();
 
   // Returns Success if the visible count matches |expected_visible|. This means
   // that the number of visible browser actions in |main_bar_| is
   // |expected_visible| and shows the first icons, and that the overflow bar
   // shows all (and only) the remainder.
-  testing::AssertionResult VerifyVisibleCount(size_t expected_visible);
+  testing::AssertionResult VerifyVisibleCount(size_t expected_visible)
+      WARN_UNUSED_RESULT;
 
   // Accessors.
   BrowserActionsContainer* main_bar() { return main_bar_; }
-  BrowserActionsContainer* overflow_bar() { return overflow_bar_.get(); }
+  BrowserActionsContainer* overflow_bar() { return overflow_bar_; }
   extensions::ExtensionToolbarModel* model() { return model_; }
 
  private:
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
   void TearDownOnMainThread() override;
 
   // The main BrowserActionsContainer (owned by the browser view).
   BrowserActionsContainer* main_bar_;
 
+  // A parent view for the overflow menu.
+  scoped_ptr<views::View> overflow_parent_;
+
   // The overflow BrowserActionsContainer. We manufacture this so that we don't
   // have to open the wrench menu.
-  scoped_ptr<BrowserActionsContainer> overflow_bar_;
+  // Owned by the |overflow_parent_|.
+  BrowserActionsContainer* overflow_bar_;
 
   // The associated toolbar model.
   extensions::ExtensionToolbarModel* model_;
 
   // Enable the feature redesign switch.
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainerOverflowTest);
 };
 
 void BrowserActionsContainerOverflowTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);
   enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::extension_action_redesign(),
       true));
 }
 
 void BrowserActionsContainerOverflowTest::SetUpOnMainThread() {
   BrowserActionsBarBrowserTest::SetUpOnMainThread();
   main_bar_ = BrowserView::GetBrowserViewForBrowser(browser())
                   ->toolbar()->browser_actions();
-  overflow_bar_.reset(new BrowserActionsContainer(browser(), main_bar_));
-  overflow_bar_->set_owned_by_client();
+  overflow_parent_.reset(new views::View());
+  overflow_parent_->set_owned_by_client();
+  overflow_bar_ = new BrowserActionsContainer(browser(), main_bar_);
+  overflow_parent_->AddChildView(overflow_bar_);
   model_ = extensions::ExtensionToolbarModel::Get(profile());
 }
 
 void BrowserActionsContainerOverflowTest::TearDownOnMainThread() {
-  overflow_bar_.reset();
+  overflow_parent_.reset();
   enable_redesign_.reset();
   BrowserActionsBarBrowserTest::TearDownOnMainThread();
 }
 
 bool BrowserActionsContainerOverflowTest::ViewOrdersMatch() {
   if (main_bar_->num_toolbar_actions() !=
       overflow_bar_->num_toolbar_actions())
     return false;
   for (size_t i = 0; i < main_bar_->num_toolbar_actions(); ++i) {
     if (main_bar_->GetIdAt(i) != overflow_bar_->GetIdAt(i))
@@ skipping 103 matching lines @@
       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()->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);
+  EXPECT_TRUE(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()->GetViewForId(extension_b()->id());
   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()->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);
+  EXPECT_TRUE(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()->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);
+  EXPECT_TRUE(VerifyVisibleCount(3u));
 }