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

Side by Side Diff: base/test/test_suite.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months 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
« no previous file with comments | « base/sha2_unittest.cc ('k') | base/third_party/nss/LICENSE » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/test/test_suite.h" 5 #include "base/test/test_suite.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base_paths.h" 8 #include "base/base_paths.h"
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/debug_on_start_win.h" 11 #include "base/debug/debug_on_start_win.h"
12 #include "base/debug/debugger.h" 12 #include "base/debug/debugger.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/i18n/icu_util.h" 14 #include "base/i18n/icu_util.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/mac/scoped_nsautorelease_pool.h" 16 #include "base/mac/scoped_nsautorelease_pool.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/nss_util.h"
19 #include "base/path_service.h" 18 #include "base/path_service.h"
20 #include "base/process_util.h" 19 #include "base/process_util.h"
21 #include "base/test/multiprocess_test.h" 20 #include "base/test/multiprocess_test.h"
22 #include "base/test/test_timeouts.h" 21 #include "base/test/test_timeouts.h"
23 #include "base/time.h" 22 #include "base/time.h"
24 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
25 #include "testing/multiprocess_func_list.h" 24 #include "testing/multiprocess_func_list.h"
26 25
27 #if defined(OS_MACOSX) 26 #if defined(OS_MACOSX)
28 #include "base/test/mock_chrome_application_mac.h" 27 #include "base/test/mock_chrome_application_mac.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // In some cases, we do not want to see standard error dialogs. 206 // In some cases, we do not want to see standard error dialogs.
208 if (!base::debug::BeingDebugged() && 207 if (!base::debug::BeingDebugged() &&
209 !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) { 208 !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
210 SuppressErrorDialogs(); 209 SuppressErrorDialogs();
211 base::debug::SetSuppressDebugUI(true); 210 base::debug::SetSuppressDebugUI(true);
212 logging::SetLogAssertHandler(UnitTestAssertHandler); 211 logging::SetLogAssertHandler(UnitTestAssertHandler);
213 } 212 }
214 213
215 icu_util::Initialize(); 214 icu_util::Initialize();
216 215
217 #if defined(USE_NSS)
218 // Trying to repeatedly initialize and cleanup NSS and NSPR may result in
219 // a deadlock. Such repeated initialization will happen when using test
220 // isolation. Prevent problems by initializing NSS here, so that the cleanup
221 // will be done only on process exit.
222 base::EnsureNSSInit();
223 #endif // defined(USE_NSS)
224
225 CatchMaybeTests(); 216 CatchMaybeTests();
226 217
227 TestTimeouts::Initialize(); 218 TestTimeouts::Initialize();
228 } 219 }
229 220
230 void TestSuite::Shutdown() { 221 void TestSuite::Shutdown() {
231 } 222 }
OLDNEW
« no previous file with comments | « base/sha2_unittest.cc ('k') | base/third_party/nss/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698