diff options
| author | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 20:35:54 +0000 |
|---|---|---|
| committer | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 20:35:54 +0000 |
| commit | 9a8fe19a1ed7345d6c2a77c28b8be85fc0ce99f9 (patch) | |
| tree | 5afa99aa9cd6c22bbfe9f6fd24d4ff8b3eb0af9d /chrome/browser/extensions/extension_browsertests_misc.cc | |
| parent | fedaa7dbb468ff581f0a7d30d2410da15363d359 (diff) | |
| download | chromium_src-9a8fe19a1ed7345d6c2a77c28b8be85fc0ce99f9.zip chromium_src-9a8fe19a1ed7345d6c2a77c28b8be85fc0ce99f9.tar.gz chromium_src-9a8fe19a1ed7345d6c2a77c28b8be85fc0ce99f9.tar.bz2 | |
Enable extension tests now that upstream r53815 has fixed the crash in pthread_join on Linux.
BUG=33085
TEST=none
Review URL: http://codereview.chromium.org/552155
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertests_misc.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 83267c8..b6c3da8 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -377,21 +377,6 @@ void GetParsedFeedData(HTTPTestServer* server, EXPECT_STREQ(expected_error.c_str(), error.c_str()); } -#if defined(OS_LINUX) -// http://crbug.com/33085 Temporarily disabled some browser tests -// that fail because of r53715 upstream. -#define ParseFeedValidFeed0 DISABLED_ParseFeedValidFeed0 -#define ParseFeedValidFeed1 DISABLED_ParseFeedValidFeed1 -#define ParseFeedValidFeed2 DISABLED_ParseFeedValidFeed2 -#define ParseFeedValidFeed3 DISABLED_ParseFeedValidFeed3 -#define ParseFeedValidFeed4 DISABLED_ParseFeedValidFeed4 -#define ParseFeedValidFeed5 DISABLED_ParseFeedValidFeed5 -#define ParseFeedValidFeedNoLinks DISABLED_ParseFeedValidFeedNoLinks -#define ParseFeedInvalidFeed1 DISABLED_ParseFeedInvalidFeed1 -#define ParseFeedInvalidFeed2 DISABLED_ParseFeedInvalidFeed2 -#define ParseFeedInvalidFeed3 DISABLED_ParseFeedInvalidFeed3 -#endif - IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) { HTTPTestServer* server = StartHTTPServer(); GetParsedFeedData(server, kValidFeed1, browser(), |