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

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

Issue 206693004: Update media browser tests to observe plugin crashes! (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 9 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
Index: chrome/browser/media/media_browsertest.h
diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h
index d84816b975bb53c41686ef4ee7715508980012c7..bd95170bd2a3c9af06a4244b71a6187b4b77cf22 100644
--- a/chrome/browser/media/media_browsertest.h
+++ b/chrome/browser/media/media_browsertest.h
@@ -9,6 +9,7 @@
#include <vector>
#include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/browser/web_contents_observer.h"
namespace content {
class TitleWatcher;
@@ -17,7 +18,8 @@ class TitleWatcher;
// Class used to automate running media related browser tests. The functions
// assume that media files are located under files/media/ folder known to
// the test http server.
-class MediaBrowserTest : public InProcessBrowserTest {
+class MediaBrowserTest : public InProcessBrowserTest,
+ public content::WebContentsObserver {
protected:
typedef std::pair<std::string, std::string> StringPair;
@@ -26,6 +28,7 @@ class MediaBrowserTest : public InProcessBrowserTest {
// TODO(xhwang): Report detailed errors, e.g. "ERROR-3".
static const char kError[];
static const char kFailed[];
+ static const char kPluginCrashed[];
MediaBrowserTest();
virtual ~MediaBrowserTest();
@@ -43,6 +46,17 @@ class MediaBrowserTest : public InProcessBrowserTest {
base::string16 RunTest(const GURL& gurl, const std::string& expected);
virtual void AddWaitForTitles(content::TitleWatcher* title_watcher);
+
+ // Fails test and sets document title to kPluginCrashed when a plugin crashes.
+ // If IgnorePluginCrash(true) is called then plugin crash is ignored.
+ virtual void PluginCrashed(const base::FilePath& plugin_path,
+ base::ProcessId plugin_pid) OVERRIDE;
+
+ // Sets whether plugin crash should be ignored or not. Default is false.
+ void IgnorePluginCrash(bool ignore);
ddorwin 2014/03/21 17:06:29 nit: This should probably either not take a bool o
shadi1 2014/03/21 18:43:54 I think not having it take a bool seems good (unti
+
+ private:
+ bool ignore_plugin_crash_;
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_

Powered by Google App Engine
This is Rietveld 408576698