chromium/src
0
Fork 0
Code Activity

WebKit roll 114621:114660

Browse Source 
BUG:124300

TBR: yurys@chromium.org, vsevlk@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10133001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133061 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
dimich@chromium.org
2012-04-19 21:30:10 +00:00
parent 6595631b0b
commit a8f3026e71
2 changed files with 5 additions and 3 deletions
DEPS
chrome/browser/debugger
devtools_sanity_unittest.cc

2
DEPS

@@ -5,7 +5,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "114621", "webkit_revision": "114660",
"chromium_git": "http://git.chromium.org/git", "chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281", "swig_revision": "69281",
"nacl_revision": "8290", "nacl_revision": "8290",

6
chrome/browser/debugger/devtools_sanity_unittest.cc

@@ -412,7 +412,8 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
// Tests scripts panel showing. // Tests scripts panel showing.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { // Disabled - see http://crbug.com/124300
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestShowScriptsTab) {
RunTest("testShowScriptsTab", kDebuggerTestPage); RunTest("testShowScriptsTab", kDebuggerTestPage);
} }
@@ -462,8 +463,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest,
} }
// Tests that scripts are not duplicated after Scripts Panel switch. // Tests that scripts are not duplicated after Scripts Panel switch.
// Disabled - see http://crbug.com/124300
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
TestNoScriptDuplicatesOnPanelSwitch) { DISABLED_TestNoScriptDuplicatesOnPanelSwitch) {
RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage); RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage);
} }