summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authoryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 10:46:22 +0000
committeryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 10:46:22 +0000
commit680bc22edef68385990c180f1cb7bd9e5a44de93 (patch)
treeedca64d0bdcaa8996dd084995d5116840fd58c5d /chrome/test
parent9978ea8613e2571b37714bd3cf08e0313fb117a6 (diff)
downloadchromium_src-680bc22edef68385990c180f1cb7bd9e5a44de93.zip
chromium_src-680bc22edef68385990c180f1cb7bd9e5a44de93.tar.gz
chromium_src-680bc22edef68385990c180f1cb7bd9e5a44de93.tar.bz2
DevTools: fix and enable DevToolsExtensionDebugTest.TestContentScriptIsPresent.
Review URL: http://codereview.chromium.org/328029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/devtools/page_with_content_script.html13
-rw-r--r--chrome/test/ui_test_utils.cc2
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/test/data/devtools/page_with_content_script.html b/chrome/test/data/devtools/page_with_content_script.html
new file mode 100644
index 0000000..d38591e
--- /dev/null
+++ b/chrome/test/data/devtools/page_with_content_script.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<script>
+
+
+function handleClick() {
+}
+</script>
+</head>
+<body>
+<input id='btn' type='button' onclick='handleClick()' value='Test'/>
+</body>
+</html> \ No newline at end of file
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 4a0ef2a..c9348b3 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -83,7 +83,7 @@ class DOMOperationObserver : public NotificationObserver {
explicit DOMOperationObserver(RenderViewHost* render_view_host) {
registrar_.Add(this, NotificationType::DOM_OPERATION_RESPONSE,
Source<RenderViewHost>(render_view_host));
- RunMessageLoop();
+ ui_test_utils::RunMessageLoop();
}
virtual void Observe(NotificationType type,