[Media Router] Add integration browser tests

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"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace media_router {
 
 namespace {
 const char kTestSinkName[] = "test-sink-1";
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {
-  OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));
+  OpenTestPage(FILE_PATH_LITERAL("basic_test.html"), browser());
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::WebContents* dialog_contents = OpenMRDialog(web_contents);
-  WaitUntilSinkDiscoveredOnUI();
+  WaitUntilSinkDiscoveredOnUI(web_contents);
   // Verify the sink list.
   std::string sink_length_script = base::StringPrintf(
       "domAutomationController.send("
       "window.document.getElementById('media-router-container')."
       "sinksToShow_.length)");
   ASSERT_GT(ExecuteScriptAndExtractInt(dialog_contents, sink_length_script), 0);
   LOG(INFO) << "Choose Sink";
   ChooseSink(web_contents, kTestSinkName);
 
 // Linux and Windows bots run browser tests without a physical display, which
@@ skipping 94 matching lines @@
 #if defined(OS_MACOSX)
   LOG(INFO) << "Waiting for dialog to be closed";
   WaitUntilDialogClosed(web_contents);
 #endif
   LOG(INFO) << "Closed dialog, end of test";
 }
 
 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"));
+  OpenTestPage(FILE_PATH_LITERAL("basic_test.html"), browser());
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::WebContents* dialog_contents = OpenMRDialog(web_contents);
 
   // Verify the sink list.
   std::string sink_length_script = base::StringPrintf(
       "domAutomationController.send("
       "window.document.getElementById('media-router-container')."
       "sinksToShow_.length)");
   ASSERT_GT(ExecuteScriptAndExtractInt(dialog_contents, sink_length_script), 0);
@@ skipping 14 matching lines @@
   // TODO(imcheng): Fix host name for file schemes (crbug.com/560576).
   ASSERT_EQ(l10n_util::GetStringFUTF8(
                 IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT, base::string16()),
             issue_title);
 
   // Route will still get created, it just takes longer than usual.
   WaitUntilRouteCreated();
 }
 
 }  // namespace media_router