Convert the media and audio UI test to a browser_test. browser_tests are sharded and run quicker, a…

content/test/layout_browsertest.cc

 // Copyright (c) 2012 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 "content/test/layout_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 66 matching lines @@
       "  this.workerThreadCount = 0; \n"
       "}\n"
       "window.layoutTestController = new LayoutTestController();\n"
       "</script>";
 
 }
 
 InProcessBrowserLayoutTest::InProcessBrowserLayoutTest(
     const FilePath& test_parent_dir, const FilePath& test_case_dir)
     : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
-      port_(-2) {
+      port_(-2), wait_until_done_(true) {
   EnableDOMAutomation();
 }
 
 InProcessBrowserLayoutTest::InProcessBrowserLayoutTest(
     const FilePath& test_parent_dir, const FilePath& test_case_dir, int port)
     : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
-      port_(port) {
+      port_(port), wait_until_done_(true) {
   EnableDOMAutomation();
 }
 
 InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
   if (test_http_server_.get())
     CHECK(test_http_server_->Stop());
 }
 
 void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
   ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
@@ skipping 68 matching lines @@
   RunLayoutTestInternal(test_case_file_name, url);
 }
 
 void InProcessBrowserLayoutTest::RunLayoutTestInternal(
     const std::string& test_case_file_name, const GURL& url) {
   LOG(INFO) << "Navigating to URL " << url << " and blocking.";
   const string16 expected_title = ASCIIToUTF16("done");
   ui_test_utils::TitleWatcher title_watcher(
       browser()->GetSelectedWebContents(), expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
-  LOG(INFO) << "Navigation completed, now waiting for title.";
-  string16 final_title = title_watcher.WaitAndGetTitle();
-  EXPECT_EQ(expected_title, final_title);
+
+  if (wait_until_done_) {
+    LOG(INFO) << "Navigation completed, now waiting for notifyDone.";
+    string16 final_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, final_title);
+  }
 
   std::string actual_text;
   ScrapeResultFromBrowser(browser(), &actual_text);
   ReplaceSubstringsAfterOffset(&actual_text, 0, "\r", "");
   TrimString(actual_text, "\n", &actual_text);
 
   std::string expected_text;
   // Reads the expected result. First try to read from rebase directory.
   // If failed, read from original directory.
   if (!ReadExpectedResult(rebase_result_dir_,
@@ skipping 48 matching lines @@
   ASSERT_TRUE(file_util::ReadFileToString(path_to_single_test, &test_html));
 
   size_t insertion_position = FindInsertPosition(test_html);
   test_html.insert(insertion_position, preamble);
   *test_path = our_layout_test_temp_dir_.Append(test_case_dir_);
   *test_path = test_path->AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(*test_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 }