Close wrench menu when Media Router Action clicked in Views.

chrome/browser/ui/views/media_router/media_router_ui_browsertest.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/bind.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/ui/browser.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/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 11 matching lines @@
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
 
     BrowserActionsContainer* browser_actions_container =
         BrowserView::GetBrowserViewForBrowser(browser())
             ->toolbar()
             ->browser_actions();
     ASSERT_TRUE(browser_actions_container);
 
-    media_router_action_.reset(new MediaRouterAction);
+    media_router_action_.reset(new MediaRouterAction(browser()));
 
     // Sets delegate on |media_router_action_|.
     toolbar_action_view_.reset(
         new ToolbarActionView(media_router_action_.get(), browser()->profile(),
                               browser_actions_container));
   }
 
   void OpenMediaRouterDialogAndWaitForNewWebContents() {
     content::TestNavigationObserver nav_observer(NULL);
     nav_observer.StartWatchingNewWebContents();
-    media_router_action_->ExecuteAction(true);
+
+    ToolbarView* toolbar =

[Devlin, 2015/07/16 17:17:37]

Just by looking at this test, it's not immediately clear to me that we're
actually testing the action executed.  Can you:
- Add a comment saying something like "When the media router action executes, it
pops up a dialog with a web contents to <url>."
- Check the value of nav_observer.last_committed_url().

[apacible, 2015/07/16 18:13:13]

Done.

+        BrowserView::GetBrowserViewForBrowser(browser())->toolbar();
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+        base::Bind(&MediaRouterUIBrowserTest::ExecuteMediaRouterAction,
+                   this,
+                   toolbar));
+    toolbar->ShowAppMenu(false);
+
+    ASSERT_FALSE(toolbar->IsWrenchMenuShowing());

[Devlin, 2015/07/16 17:17:37]

nit: This (and the assert in ExecuteMediaRouterAction) can be EXPECTs.

[apacible, 2015/07/16 18:13:13]

Done.

+
     nav_observer.Wait();
     nav_observer.StopWatchingNewWebContents();
   }
 
+  void ExecuteMediaRouterAction(ToolbarView* toolbar) {
+    ASSERT_TRUE(toolbar->IsWrenchMenuShowing());
+    media_router_action_->ExecuteAction(true);
+  }
+
  protected:
   // Must be initialized after |InProcessBrowserTest::SetUpOnMainThread|.
   scoped_ptr<MediaRouterAction> media_router_action_;
 
   // ToolbarActionView constructed to set the delegate on |mr_action|.
   scoped_ptr<ToolbarActionView> toolbar_action_view_;
 };
 
 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
                        OpenDialogWithMediaRouterAction) {
   // We start off at about:blank page.
   // Make sure there is 1 tab and media router is enabled.
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   OpenMediaRouterDialogAndWaitForNewWebContents();
 
   // Reload the browser and wait.
   content::TestNavigationObserver reload_observer(
       browser()->tab_strip_model()->GetActiveWebContents());
   chrome::Reload(browser(), CURRENT_TAB);
   reload_observer.Wait();
 
   // The reload should have removed the previously created dialog.
   // We expect a new dialog WebContents to be created by calling this.
   OpenMediaRouterDialogAndWaitForNewWebContents();
 
   // Navigate away and wait.
   content::TestNavigationObserver nav_observer(

[Devlin, 2015/07/16 17:17:37]

nit: NavigateToURL() is actually synchronous, so this is redundant.

[apacible, 2015/07/16 18:13:13]

Done.

       browser()->tab_strip_model()->GetActiveWebContents(), 1);
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   nav_observer.Wait();
 
   // The navigation should have removed the previously created dialog.
   // We expect a new dialog WebContents to be created by calling this.
   OpenMediaRouterDialogAndWaitForNewWebContents();
 }
 
 }  // namespace media_router