Index: chrome/browser/ui/webui/inspect_ui_browsertest.cc |
diff --git a/chrome/browser/ui/webui/workers_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc |
similarity index 78% |
rename from chrome/browser/ui/webui/workers_ui_browsertest.cc |
rename to chrome/browser/ui/webui/inspect_ui_browsertest.cc |
index c3a3a57bcebefa3018f59ff5d48054be73af7c02..7140b4ae5c8e41fc2a4caf6e412ca449aac721c6 100644 |
--- a/chrome/browser/ui/webui/workers_ui_browsertest.cc |
+++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc |
@@ -18,26 +18,31 @@ const char kSharedWorkerTestPage[] = |
const char kSharedWorkerJs[] = |
"files/workers/workers_ui_shared_worker.js"; |
-class WorkersUITest : public InProcessBrowserTest { |
+class InspectUITest : public InProcessBrowserTest { |
public: |
- WorkersUITest() { |
+ InspectUITest() { |
set_show_window(true); |
EnableDOMAutomation(); |
} |
private: |
- DISALLOW_COPY_AND_ASSIGN(WorkersUITest); |
+ DISALLOW_COPY_AND_ASSIGN(InspectUITest); |
}; |
// The test fails on Mac OS X, see crbug.com/89583 |
-IN_PROC_BROWSER_TEST_F(WorkersUITest, DISABLED_SharedWorkersList) { |
+#if defined(OS_MACOSX) |
+#define MAYBE_SharedWorkersList DISABLED_SharedWorkersList |
+#else |
+#define MAYBE_SharedWorkersList SharedWorkersList |
+#endif |
+IN_PROC_BROWSER_TEST_F(InspectUITest, MAYBE_SharedWorkersList) { |
yurys
2012/03/20 12:42:06
Please add a test for other types of inspectable i
pfeldman
2012/03/20 13:22:10
Done.
|
ASSERT_TRUE(test_server()->Start()); |
GURL url = test_server()->GetURL(kSharedWorkerTestPage); |
ui_test_utils::NavigateToURL(browser(), url); |
ui_test_utils::NavigateToURLWithDisposition( |
browser(), |
- GURL(chrome::kChromeUIWorkersURL), |
+ GURL(chrome::kChromeUIInspectURL), |
NEW_FOREGROUND_TAB, |
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
@@ -50,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(WorkersUITest, DISABLED_SharedWorkersList) { |
web_contents->GetRenderViewHost(), |
L"", |
L"window.domAutomationController.send(" |
- L"'' + document.getElementsByTagName('td')[1].textContent);", |
+ L"'' + document.body.textContent);", |
&result)); |
ASSERT_TRUE(result.find(kSharedWorkerJs) != std::string::npos); |
} |