diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 08:04:51 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 08:04:51 +0000 |
| commit | d41381fc0ab7d1b63b9c5a2e6a0d1fd89f1a1b48 (patch) | |
| tree | cfdf8c8440e1838975dc3751f47abd1ccb6171d5 | |
| parent | 12bc847c2b6fcb8fc9540cd66c43c3cb166eccda (diff) | |
| download | chromium_src-d41381fc0ab7d1b63b9c5a2e6a0d1fd89f1a1b48.zip chromium_src-d41381fc0ab7d1b63b9c5a2e6a0d1fd89f1a1b48.tar.gz chromium_src-d41381fc0ab7d1b63b9c5a2e6a0d1fd89f1a1b48.tar.bz2 | |
Update and enable DevToolsSanityTest.TestProfilerTab.
BUG=41291
TEST=DevToolsSanityTest.TestProfilerTab
TBR=pfeldman@chromium.org
Review URL: http://codereview.chromium.org/1604037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44634 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/data/devtools/js_page.html | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 6c6911d..5b3792a 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -305,11 +305,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestCachedResourceMimeType) { // Tests profiler panel. // Temporarily disabled, @see http://crbug.com/41291 -/* IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) { RunTest("testProfilerTab", kJsPage); } -*/ // Tests scripts panel showing. IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { diff --git a/chrome/test/data/devtools/js_page.html b/chrome/test/data/devtools/js_page.html index 1fde9fe..0e8d2b7 100644 --- a/chrome/test/data/devtools/js_page.html +++ b/chrome/test/data/devtools/js_page.html @@ -6,15 +6,11 @@ } function eternal_fib() { - var started = Date.now(); - while(true) { + console.profile(); + for (var i = 0; i < 50; ++i) { fib(20); - // Make page responsive by making a break every 100 ms. - if (Date.now() - started >= 100) { - setTimeout(eternal_fib, 0); - return; - } } + console.profileEnd(); } function load() { |