summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 15:18:56 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 15:18:56 +0000
commit2add77b802f0f5cab795a0a4d9ecb48003447d51 (patch)
tree9593e71e7630ed903210692f4f2787c1054761bd
parentb78084e92e2bc0a05ccdb1bddf446b4af596e8bd (diff)
downloadchromium_src-2add77b802f0f5cab795a0a4d9ecb48003447d51.zip
chromium_src-2add77b802f0f5cab795a0a4d9ecb48003447d51.tar.gz
chromium_src-2add77b802f0f5cab795a0a4d9ecb48003447d51.tar.bz2
DevTools: Webkit merge broke DevToolsSanityTest.TestEnableResourcesTab
BUG=26171 TBR=yurys Review URL: http://codereview.chromium.org/340035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30456 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc2
-rw-r--r--webkit/glue/devtools/js/tests.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 02d9bd3..a3fb609 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -263,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMainResource) {
}
// Tests resources panel enabling.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestEnableResourcesTab) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
RunTest("testEnableResourcesTab", kSimplePage);
}
diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js
index 5c44afb..91d8b2f 100644
--- a/webkit/glue/devtools/js/tests.js
+++ b/webkit/glue/devtools/js/tests.js
@@ -230,7 +230,8 @@ TestSuite.prototype.testEnableResourcesTab = function() {
function(identifier, payload) {
test.assertEquals('simple_page.html', payload.lastPathComponent);
WebInspector.panels.resources.refresh();
- WebInspector.resources[identifier]._resourcesTreeElement.select();
+ WebInspector.panels.resources.revealAndSelectItem(
+ WebInspector.resources[identifier]);
test.releaseControl();
});