Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: chrome/browser/extensions/sandboxed_unpacker_unittest.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/sandboxed_unpacker_unittest.cc
diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
index 39f634e366b401cae4744871555ce8c9e333cba4..7428cba7a68bdd57b06f23fe888162a07d9456c2 100644
--- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
@@ -115,7 +115,15 @@ TEST_F(SandboxedUnpackerTest, NoCatalogsSuccess) {
EXPECT_FALSE(base::PathExists(install_path));
}
-TEST_F(SandboxedUnpackerTest, WithCatalogsSuccess) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+// Consistently times out.
+// TODO(erg): linux_aura bringup: http://crbug.com/163931
+#define MAYBE_WithCatalogsSuccess DISABLED_WithCatalogsSuccess
+#else
+#define MAYBE_WithCatalogsSuccess WithCatalogsSuccess
+#endif
+
+TEST_F(SandboxedUnpackerTest, MAYBE_WithCatalogsSuccess) {
SetupUnpacker("good_l10n.crx");
// Check that there is _locales folder.
base::FilePath install_path =
« no previous file with comments | « chrome/browser/extensions/extension_tabs_apitest.cc ('k') | chrome/browser/extensions/subscribe_page_action_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698