[Media Router] Auto-close Media Router dialog after starting or stopping a session.

chrome/test/media_router/media_router_integration_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 "chrome/test/media_router/media_router_integration_browsertest.h"
 
 #include "base/files/file_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 15 matching lines @@
 
   // Verify the sink list.
   std::string sink_length_script = base::StringPrintf(
       "domAutomationController.send("
       "window.document.getElementById('media-router-container')."
       "sinksToShow_.length)");
   ASSERT_EQ(2, ExecuteScriptAndExtractInt(dialog_contents, sink_length_script));
 
   ChooseSink(web_contents, kTestSinkName);
   WaitUntilRouteCreated();
+  ClickDialog();

[imcheng, 2015/10/22 18:44:14]

Add some comments explaining what this is doing, e.g. simulate a click on the
dialog to prevent it from automatically closing after a route is created.

[apacible, 2015/10/23 18:03:11]

Done.

+  CheckDialogIsOpen(web_contents);
 
   // Verify the route details page.
   std::string route_info_script = base::StringPrintf(
       "domAutomationController.send("
       "window.document.getElementById('media-router-container').shadowRoot."
       "getElementById('route-details').shadowRoot.getElementById("
       "'route-information').getElementsByTagName('span')[0].innerText)");
   std::string route_information = ExecuteScriptAndExtractString(
       dialog_contents, route_info_script);
   ASSERT_EQ("Casting: Test Route", route_information);
 
   std::string sink_name_script = base::StringPrintf(
       "domAutomationController.send("
       "window.document.getElementById('media-router-container').shadowRoot."
       "getElementById('route-details').shadowRoot.getElementById("
       "'route-details-header').shadowRoot.getElementById('header-text')."
       "innerText)");
   std::string sink_name = ExecuteScriptAndExtractString(
       dialog_contents, sink_name_script);
   ASSERT_EQ(kTestSinkName, sink_name);
 
   // Close route.
   CloseRouteOnUI();
+  CheckDialogIsClosed(web_contents);

[imcheng, 2015/10/22 18:44:14]

Same here.

[apacible, 2015/10/23 18:03:11]

Done.

 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
                        MANUAL_Dialog_RouteCreationTimedOut) {
   SetTestData(FILE_PATH_LITERAL("route_creation_timed_out.json"));
   OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::WebContents* dialog_contents = OpenMRDialog(web_contents);
 
@@ skipping 19 matching lines @@
   std::string issue_title = GetIssueTitle();
   ASSERT_EQ(l10n_util::GetStringUTF8(
                 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB),
             issue_title);
 
   // Route will still get created, it just takes longer than usual.
   WaitUntilRouteCreated();
 }
 
 }  // namespace media_router