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

content/test/layout_browsertest.h

 // 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 "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
 class LayoutTestHttpServer;
 
@@ skipping 16 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
   // Runs a layout test given its filename relative to the path given to the
   // constructor.
   void RunLayoutTest(const std::string& test_case_file_name);
   // Runs a layout test using the HTTP test server. The second constructor must
   // have been used.
   void RunHttpLayoutTest(const std::string& test_case_file_name);
   void AddResourceForLayoutTest(const FilePath& parent_dir,
                                 const FilePath& resource_name);
 
+  void set_wait_until_done(bool value) { wait_until_done_ = value; }
+
  private:
   void RunLayoutTestInternal(const std::string& test_case_file_name,
                              const GURL& url);
   void WriteModifiedFile(const std::string& test_case_file_name,
                          FilePath* test_path);
 
   FilePath our_original_layout_test_dir_;
   FilePath test_parent_dir_;
   FilePath test_case_dir_;
   FilePath our_layout_test_temp_dir_;
   FilePath rebase_result_dir_;
   FilePath rebase_result_chromium_dir_;
   FilePath rebase_result_win_dir_;
   ScopedTempDir scoped_temp_dir_;
   int port_;  // -2 means no port.  -1 means random.
+  // By default, tests will wait until layoutTestController.notifyDone() is
+  // called.
+  bool wait_until_done_;
   scoped_ptr<LayoutTestHttpServer> test_http_server_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest);
 };