[Media Router tests] Fix MANUAL_Fail_StartCancelledNoSupportedSinks.

chrome/test/media_router/media_router_integration_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 <memory>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 145 matching lines @@
 
   // Extract the fields.
   bool passed = false;
   ASSERT_TRUE(dict_value->GetBoolean("passed", &passed));
   std::string error_message;
   ASSERT_TRUE(dict_value->GetString("errorMessage", &error_message));
 
   ASSERT_TRUE(passed) << error_message;
 }
 
-WebContents* MediaRouterIntegrationBrowserTest::StartSessionWithTestPageNow() {
+void MediaRouterIntegrationBrowserTest::StartSessionAndAssertNotFoundError() {
   OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
   WebContents* web_contents = GetActiveWebContents();
   CHECK(web_contents);
   StartSession(web_contents);
-  return web_contents;
+
+  // Wait a bit for the UI to settle.

[mark a. foltz, 2017/05/31 22:54:20]

Maybe update this to "Wait for any sinks to be displayed."

[imcheng, 2017/05/31 23:12:27]

Done.

+  Wait(base::TimeDelta::FromSeconds(1));
+  GetControllerForShownDialog(web_contents)->HideMediaRouterDialog();
+  CheckStartFailed(web_contents, "NotFoundError", "No screens found.");
 }
 
 WebContents*
 MediaRouterIntegrationBrowserTest::StartSessionWithTestPageAndSink() {
   OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
   WebContents* web_contents = GetActiveWebContents();
   CHECK(web_contents);
   ExecuteJavaScriptAPI(web_contents, kWaitSinkScript);
   StartSession(web_contents);
   return web_contents;
@@ skipping 439 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
                        MANUAL_Fail_StartCancelled) {
   WebContents* web_contents = StartSessionWithTestPageAndSink();
   GetControllerForShownDialog(web_contents)->HideMediaRouterDialog();
   CheckStartFailed(web_contents, "NotAllowedError", "Dialog closed.");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
                        MANUAL_Fail_StartCancelledNoSinks) {
   SetTestData(FILE_PATH_LITERAL("no_sinks.json"));
-  WebContents* web_contents = StartSessionWithTestPageNow();
-  GetControllerForShownDialog(web_contents)->HideMediaRouterDialog();
-  CheckStartFailed(web_contents, "NotFoundError", "No screens found.");
+  StartSessionAndAssertNotFoundError();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,
                        MANUAL_Fail_StartCancelledNoSupportedSinks) {
   SetTestData(FILE_PATH_LITERAL("no_supported_sinks.json"));
-  WebContents* web_contents = StartSessionWithTestPageNow();
-  WaitUntilSinkDiscoveredOnUI();
-  GetControllerForShownDialog(web_contents)->HideMediaRouterDialog();
-  CheckStartFailed(web_contents, "NotFoundError", "No screens found.");
+  StartSessionAndAssertNotFoundError();
 }
 
 void MediaRouterIntegrationIncognitoBrowserTest::InstallAndEnableMRExtension() {
   const extensions::Extension* extension =
       LoadExtensionIncognito(extension_unpacked_);
   incognito_extension_id_ = extension->id();
 }
 
 void MediaRouterIntegrationIncognitoBrowserTest::UninstallMRExtension() {
   if (!incognito_extension_id_.empty()) {
@@ skipping 11 matching lines @@
                        MANUAL_Basic) {
   RunBasicTest();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationIncognitoBrowserTest,
                        MANUAL_ReconnectSession) {
   RunReconnectSessionTest();
 }
 
 }  // namespace media_router