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

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

Issue 516693002: Revert of Initialize the now_funciton to the HighResNowWrapper in case High Res is supported (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | base/time/time.h » ('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) 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/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/bind.h" 10 #include "base/bind.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // Windows CommandLine::Init ignores argv anyway. 128 // Windows CommandLine::Init ignores argv anyway.
129 initialized_command_line_ = CommandLine::Init(argc, NULL); 129 initialized_command_line_ = CommandLine::Init(argc, NULL);
130 testing::InitGoogleTest(&argc, argv); 130 testing::InitGoogleTest(&argc, argv);
131 testing::InitGoogleMock(&argc, argv); 131 testing::InitGoogleMock(&argc, argv);
132 } 132 }
133 #endif // defined(OS_WIN) 133 #endif // defined(OS_WIN)
134 134
135 void TestSuite::PreInitialize(bool create_at_exit_manager) { 135 void TestSuite::PreInitialize(bool create_at_exit_manager) {
136 #if defined(OS_WIN) 136 #if defined(OS_WIN)
137 testing::GTEST_FLAG(catch_exceptions) = false; 137 testing::GTEST_FLAG(catch_exceptions) = false;
138 base::TimeTicks::SetNowIsHighResNowIfSupported();
138 #endif 139 #endif
139 base::EnableTerminationOnHeapCorruption(); 140 base::EnableTerminationOnHeapCorruption();
140 #if defined(OS_LINUX) && defined(USE_AURA) 141 #if defined(OS_LINUX) && defined(USE_AURA)
141 // When calling native char conversion functions (e.g wrctomb) we need to 142 // When calling native char conversion functions (e.g wrctomb) we need to
142 // have the locale set. In the absence of such a call the "C" locale is the 143 // have the locale set. In the absence of such a call the "C" locale is the
143 // default. In the gtk code (below) gtk_init() implicitly sets a locale. 144 // default. In the gtk code (below) gtk_init() implicitly sets a locale.
144 setlocale(LC_ALL, ""); 145 setlocale(LC_ALL, "");
145 #endif // defined(OS_LINUX) && defined(USE_AURA) 146 #endif // defined(OS_LINUX) && defined(USE_AURA)
146 147
147 // On Android, AtExitManager is created in 148 // On Android, AtExitManager is created in
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 ResetCommandLine(); 328 ResetCommandLine();
328 #if !defined(OS_IOS) 329 #if !defined(OS_IOS)
329 AddTestLauncherResultPrinter(); 330 AddTestLauncherResultPrinter();
330 #endif // !defined(OS_IOS) 331 #endif // !defined(OS_IOS)
331 332
332 TestTimeouts::Initialize(); 333 TestTimeouts::Initialize();
333 } 334 }
334 335
335 void TestSuite::Shutdown() { 336 void TestSuite::Shutdown() {
336 } 337 }
OLDNEW
« no previous file with comments | « no previous file | base/time/time.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698