[Media Router Action] Hide action back in the overflow menu after popping it out

chrome/browser/ui/toolbar/media_router_action_unittest.cc

 // Copyright 2015 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 "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 using content::WebContents;
 using media_router::MediaRouterDialogControllerImpl;
+using testing::Return;
+
+class MockToolbarActionsBar : public ToolbarActionsBar {
+ public:
+  MockToolbarActionsBar(ToolbarActionsBarDelegate* delegate, Browser* browser)
+      : ToolbarActionsBar(delegate, browser, nullptr) {}
+  ~MockToolbarActionsBar() override {}
+
+  MOCK_METHOD0(UndoPopOut, void());
+  MOCK_METHOD0(popped_out_action, ToolbarActionViewController*());
+};
 
 class MockToolbarActionViewDelegate : public ToolbarActionViewDelegate {
  public:
   MockToolbarActionViewDelegate() {}
   ~MockToolbarActionViewDelegate() {}
 
   MOCK_CONST_METHOD0(GetCurrentWebContents, WebContents*());
   MOCK_METHOD0(UpdateState, void());
   MOCK_CONST_METHOD0(IsMenuRunning, bool());
   MOCK_METHOD1(OnPopupShown, void(bool by_user));
@@ skipping 71 matching lines @@
   void SetUp() override {
     MediaRouterWebUITest::SetUp();
     toolbar_model_ =
         extensions::extension_action_test_util::CreateToolbarModelForProfile(
             profile());
 
     // browser() will only be valid once BrowserWithTestWindowTest::SetUp()
     // has run.
     browser_action_test_util_.reset(
         new BrowserActionTestUtil(browser(), false));
-    action_.reset(
-        new TestMediaRouterAction(
-            browser(),
-            browser_action_test_util_->GetToolbarActionsBar()));
+    action_.reset(new TestMediaRouterAction(browser(), GetActionsBar()));
 
     local_display_route_list_.push_back(
         media_router::MediaRoute("routeId1", fake_source1_, "sinkId1",
                                  "description", true, std::string(), true));
     non_local_display_route_list_.push_back(
         media_router::MediaRoute("routeId2", fake_source1_, "sinkId2",
                                  "description", false, std::string(), true));
     non_local_display_route_list_.push_back(
         media_router::MediaRoute("routeId3", fake_source2_, "sinkId3",
                                  "description", true, std::string(), false));
   }
 
   void TearDown() override {
     action_.reset();
     browser_action_test_util_.reset();
     MediaRouterWebUITest::TearDown();
   }
 
   gfx::Image GetIcon(gfx::VectorIconId icon_id) {
     return gfx::Image(gfx::CreateVectorIcon(
         icon_id, MediaRouterAction::GetIconColor(icon_id)));
   }
 
+  ToolbarActionsBar* GetActionsBar() {
+    return browser_action_test_util_->GetToolbarActionsBar();
+  }
+
   TestMediaRouterAction* action() { return action_.get(); }
+  ToolbarActionsModel* toolbar_model() { return toolbar_model_; }
   const media_router::Issue& fake_issue_notification() {
     return fake_issue_notification_;
   }
   const media_router::Issue& fake_issue_warning() {
     return fake_issue_warning_;
   }
   const media_router::Issue& fake_issue_fatal() { return fake_issue_fatal_; }
   const gfx::Image active_icon() { return active_icon_; }
   const gfx::Image error_icon() { return error_icon_; }
   const gfx::Image idle_icon() { return idle_icon_; }
@@ skipping 191 matching lines @@
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   action()->ExecuteAction(true);
   EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
   dialog_controller->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller->HideMediaRouterDialog();
 }
+
+TEST_F(MediaRouterActionUnitTest, UndoPopOutOnContextMenuClosed) {
+  MockToolbarActionsBar mock_actions_bar(GetActionsBar()->delegate_for_test(),
+                                         browser());
+  TestMediaRouterAction media_router_action(browser(), &mock_actions_bar);
+  chrome::NewTab(browser());
+  MediaRouterDialogControllerImpl* dialog_controller =
+      MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
+          browser()->tab_strip_model()->GetActiveWebContents());
+  media_router_action.SetMediaRouterDialogController(dialog_controller);
+
+  // If the media router action is popped out when closing its context menu,
+  // then it should go back into the overflow menu.
+  EXPECT_CALL(mock_actions_bar, popped_out_action())

[Devlin, 2016/12/15 22:25:26]

I'm not a big fan of using mocks like this, because it really just tests the
code, rather than the behavior (and the code isn't particularly interesting). 
In the end, it becomes a change detection test, which is more of a negative.

If you want to add a test for this, we have some interactive ui tests that test
similar behavior for extensions in
chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm -
maybe we could use that type of pattern?

+      .WillOnce(Return(&media_router_action));
+  EXPECT_CALL(mock_actions_bar, UndoPopOut()).Times(1);
+  media_router_action.OnContextMenuClosed();
+}