diff options
| author | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 03:45:33 +0000 |
|---|---|---|
| committer | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 03:45:33 +0000 |
| commit | 97e44410624ad9faef4a9f3e52555861cc8deffc (patch) | |
| tree | 34abc3d2205136a948d885f4bd4c78eb812a880e /chrome/browser/extensions/extension_devtools_browsertests.cc | |
| parent | 7940e167e055ebeba7d11bf3b3b1b4cae3ef06f2 (diff) | |
| download | chromium_src-97e44410624ad9faef4a9f3e52555861cc8deffc.zip chromium_src-97e44410624ad9faef4a9f3e52555861cc8deffc.tar.gz chromium_src-97e44410624ad9faef4a9f3e52555861cc8deffc.tar.bz2 | |
Reenable TimelineApi.
BUG=52544, 69369
TESTS=ExtensionDevToolsBrowserTest.*TimelineApi
R=isherman@chromium.org, pfeldman@chromium.org
BUG=52544
TEST=browser_tests --gtest_filter=ExtensionDevToolsBrowserTest.FLAKY_TimelineApi
Review URL: http://codereview.chromium.org/9592043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_devtools_browsertests.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_devtools_browsertests.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index ccba4d1..a8759f7 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -50,8 +50,7 @@ static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager, } // Tests for the experimental timeline extensions API. -// http://crbug.com/69369 http://crbug.com/52544 -IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, FLAKY_TimelineApi) { +IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) { ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api"))); |