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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 }; 108 };
109 109
110 TEST_F(SandboxedUnpackerTest, NoCatalogsSuccess) { 110 TEST_F(SandboxedUnpackerTest, NoCatalogsSuccess) {
111 SetupUnpacker("no_l10n.crx"); 111 SetupUnpacker("no_l10n.crx");
112 // Check that there is no _locales folder. 112 // Check that there is no _locales folder.
113 base::FilePath install_path = 113 base::FilePath install_path =
114 GetInstallPath().Append(kLocaleFolder); 114 GetInstallPath().Append(kLocaleFolder);
115 EXPECT_FALSE(base::PathExists(install_path)); 115 EXPECT_FALSE(base::PathExists(install_path));
116 } 116 }
117 117
118 TEST_F(SandboxedUnpackerTest, WithCatalogsSuccess) { 118 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
119 // Consistently times out.
120 // TODO(erg): linux_aura bringup: http://crbug.com/163931
121 #define MAYBE_WithCatalogsSuccess DISABLED_WithCatalogsSuccess
122 #else
123 #define MAYBE_WithCatalogsSuccess WithCatalogsSuccess
124 #endif
125
126 TEST_F(SandboxedUnpackerTest, MAYBE_WithCatalogsSuccess) {
119 SetupUnpacker("good_l10n.crx"); 127 SetupUnpacker("good_l10n.crx");
120 // Check that there is _locales folder. 128 // Check that there is _locales folder.
121 base::FilePath install_path = 129 base::FilePath install_path =
122 GetInstallPath().Append(kLocaleFolder); 130 GetInstallPath().Append(kLocaleFolder);
123 EXPECT_TRUE(base::PathExists(install_path)); 131 EXPECT_TRUE(base::PathExists(install_path));
124 } 132 }
125 133
126 } // namespace extensions 134 } // namespace extensions
OLDNEW
« 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