Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5159)

Unified Diff: chrome/browser/media/media_browsertest.cc

Issue 8418031: Regression tests for two recently-fixed audio-related crashers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_browsertest.cc
diff --git a/chrome/browser/media/media_browsertest.cc b/chrome/browser/media/media_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..76290823d6e2e18cf02420135f5b32432110abf2
--- /dev/null
+++ b/chrome/browser/media/media_browsertest.cc
@@ -0,0 +1,90 @@
+// Copyright (c) 2011 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/bind.h"
+#include "base/callback.h"
+#include "base/test/test_timeouts.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/browser/tab_contents/tab_contents.h"
+
+class MediaBrowserTest : public InProcessBrowserTest {
+ public:
+ MediaBrowserTest()
+ : seek_jumper_url_(ui_test_utils::GetTestUrl(
+ FilePath(FILE_PATH_LITERAL("media")),
+ FilePath(FILE_PATH_LITERAL("seek-jumper.html")))) {
+ EnableDOMAutomation();
+ }
+
+ protected:
+ // Loop until |closure| returns true, CHECK-failing if
+ // this fails to happen within a reasonable amount of time.
+ void WaitForSuccess(const base::Callback<bool(void)>& closure) {
Paweł Hajdan Jr. 2011/11/02 08:43:27 Sorry, no way. Please wait for an event, this kind
Ami GONE FROM CHROMIUM 2011/11/02 16:32:48 The events I need to await for are "JS expression
Paweł Hajdan Jr. 2011/11/02 18:18:15 This is non-trivial, but I think extensions and We
+ const int kLoopIntervalMs = 250;
+ const int kNumIntervals =
+ TestTimeouts::action_timeout_ms() / kLoopIntervalMs;
+ for (int i = 0; i < kNumIntervals; ++i) {
+ if (closure.Run())
+ return;
+ MessageLoop::current()->PostDelayedTask(
+ FROM_HERE, new MessageLoop::QuitTask(), kLoopIntervalMs);
+ ui_test_utils::RunMessageLoop();
+ }
+ LOG(FATAL) << "Timed out.";
+ }
+
+ const GURL seek_jumper_url_;
+};
+
+// Helper that executes |js_expr| in |tab| and returns its evaluated value as a
+// bool.
+static bool ExecuteJavaScriptAsBool(TabContents* tab,
+ const std::wstring& js_expr) {
+ bool result = false;
+ CHECK(ui_test_utils::ExecuteJavaScriptAndExtractBool(
Paweł Hajdan Jr. 2011/11/02 08:43:27 Please avoid CHECK, on any failures the test would
Ami GONE FROM CHROMIUM 2011/11/02 16:32:48 1) Why does a CHECK (as opposed to propagating a g
Paweł Hajdan Jr. 2011/11/02 18:18:15 That's true. Now here's the catch: we still want t
+ tab->render_view_host(), L"", js_expr, &result));
+ return result;
+}
+
+// Helper that returns true iff |browser| has |expected_tab_count| tabs.
+static bool IsTabCount(Browser* browser, int expected_tab_count) {
+ return browser->tab_count() == expected_tab_count;
+}
+
+// Regression test: pending seeks shouldn't crash the browser when the tab is
+// closed.
+IN_PROC_BROWSER_TEST_F(MediaBrowserTest, SeekJumper_Alone) {
+ ui_test_utils::NavigateToURL(browser(), seek_jumper_url_);
+ WaitForSuccess(base::Bind(
+ &ExecuteJavaScriptAsBool,
+ browser()->GetTabContentsAt(0),
+ L"window.domAutomationController.send(seekCount > 100)"));
+ CHECK(ui_test_utils::SendKeyPressSync(
Paweł Hajdan Jr. 2011/11/02 08:43:27 Same here.
+ browser(), ui::VKEY_W, true, false, false, false));
+ // Lack of crash is our SUCCESS.
+}
+
+// Regression test: pending seeks shouldn't crash a shared renderer when the tab
+// containing the audio element is closed.
+IN_PROC_BROWSER_TEST_F(MediaBrowserTest, SeekJumper_SharedRenderer) {
+ ui_test_utils::NavigateToURL(browser(), seek_jumper_url_);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), seek_jumper_url_, NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WaitForSuccess(base::Bind(&IsTabCount, browser(), 2));
+ WaitForSuccess(base::Bind(
+ &ExecuteJavaScriptAsBool,
+ browser()->GetTabContentsAt(0),
+ L"window.domAutomationController.send(seekCount > 100)"));
+ CHECK(ui_test_utils::SendKeyPressSync(
+ browser(), ui::VKEY_W, true, false, false, false));
+ WaitForSuccess(base::Bind(&IsTabCount, browser(), 1));
+ // Give the renderer a bit of time to crash. Sad but necessary.
Paweł Hajdan Jr. 2011/11/02 08:43:27 Not true, at least on POSIX. On Windows it's a kno
Ami GONE FROM CHROMIUM 2011/11/02 16:32:48 I feel like you have a magic cure but you're holdi
Paweł Hajdan Jr. 2011/11/02 18:18:15 Not exactly, but yeah, I was working on this issue
+ MessageLoop::current()->PostDelayedTask(
+ FROM_HERE, new MessageLoop::QuitTask(), 2000);
Paweł Hajdan Jr. 2011/11/02 08:43:27 No hardcoded timeouts please.
Ami GONE FROM CHROMIUM 2011/11/02 16:32:48 Have you looked at the bugs that these tests are r
Paweł Hajdan Jr. 2011/11/02 18:18:15 I've read the bugs now. I think my comment about t
+ ui_test_utils::RunMessageLoop();
+ ASSERT_FALSE(browser()->GetTabContentsAt(0)->is_crashed());
+}
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698