summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 21:06:28 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 21:06:28 +0000
commit3736392e822eaa314286a387a59cde844e5e2b64 (patch)
tree1312c30138caf38d3bed3561ec86d36fcfaa7803 /chrome/browser/debugger
parent9a437d9e3d73ad9262b105aa8ecb6070d69ace13 (diff)
downloadchromium_src-3736392e822eaa314286a387a59cde844e5e2b64.zip
chromium_src-3736392e822eaa314286a387a59cde844e5e2b64.tar.gz
chromium_src-3736392e822eaa314286a387a59cde844e5e2b64.tar.bz2
Disable two tests to green up tree after webkit merge
BUG=52086 tbr=japhet Review URL: http://codereview.chromium.org/3132009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 326ec2a..b7e73af 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -430,13 +430,16 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) {
}
// Tests that scope can be expanded and contains expected variables.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestExpandScope) {
+// TODO(japhet): Disabled during webkit landing per bug http://crbug.com/52085
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestExpandScope) {
RunTest("testExpandScope", kDebuggerClosurePage);
}
// Tests that intrinsic properties(__proto__, prototype, constructor) are
// present.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDebugIntrinsicProperties) {
+// TODO(japhet): Disabled during webkit landing per bug http://crbug.com/52085
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
+ DISABLED_TestDebugIntrinsicProperties) {
RunTest("testDebugIntrinsicProperties", kDebuggerIntrinsicPropertiesPage);
}