Close wrench menu when Media Router Action clicked in Views.

chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

Index: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
index 249042b03c39315d87a1cb9901c8b54b95f20bf8..abec82929ce9b179b1a9442269914f7d52a4564c 100644
--- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -2,6 +2,8 @@
 // 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"
@@ -33,7 +35,7 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
             ->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(
@@ -44,11 +46,26 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
   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_;