summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authorphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 13:54:02 +0000
committerphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 13:54:02 +0000
commitcdaf13d1e037f0119bc8724d0907e31a2729b233 (patch)
tree7c0ee35a4e2c300bc19c88e1929353fc45c26252 /chrome/test/ui/ui_test.h
parentcc5f78155f857e3e2a3570fe56e06a219e2eb839 (diff)
downloadchromium_src-cdaf13d1e037f0119bc8724d0907e31a2729b233.zip
chromium_src-cdaf13d1e037f0119bc8724d0907e31a2729b233.tar.gz
chromium_src-cdaf13d1e037f0119bc8724d0907e31a2729b233.tar.bz2
Made the WebRTC PyAuto test detect assertions.
BUG= TEST= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10454004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 8a9947f..7748e30 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -226,7 +226,12 @@ class UITestBase {
}
// Get the number of crash dumps we've logged since the test started.
- int GetCrashCount();
+ int GetCrashCount() const;
+
+ // Returns empty string if there were no unexpected Chrome asserts or crashes,
+ // a string describing the failures otherwise. As a side effect, it will fail
+ // with EXPECT_EQ macros if this code runs within a gtest harness.
+ std::string CheckErrorsAndCrashes() const;
// Use Chromium binaries from the given directory.
void SetBrowserDirectory(const FilePath& dir);