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

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

Issue 12092078: Move string_number_conversions to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge, sort headers Created 7 years, 10 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/sys_info_linux.cc ('k') | base/test/values_test_util.cc » ('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_timeouts.h" 5 #include "base/test/test_timeouts.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/test/test_switches.h" 10 #include "base/test/test_switches.h"
11 11
12 namespace { 12 namespace {
13 13
14 #ifdef ADDRESS_SANITIZER 14 #ifdef ADDRESS_SANITIZER
15 static const int kTimeoutMultiplier = 2; 15 static const int kTimeoutMultiplier = 2;
16 #else 16 #else
17 static const int kTimeoutMultiplier = 1; 17 static const int kTimeoutMultiplier = 1;
18 #endif 18 #endif
19 19
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_, 77 InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_,
78 &action_max_timeout_ms_); 78 &action_max_timeout_ms_);
79 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, 79 InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_,
80 &large_test_timeout_ms_); 80 &large_test_timeout_ms_);
81 81
82 // The timeout values should be increasing in the right order. 82 // The timeout values should be increasing in the right order.
83 CHECK(tiny_timeout_ms_ <= action_timeout_ms_); 83 CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
84 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 84 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
85 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 85 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
86 } 86 }
OLDNEW
« no previous file with comments | « base/sys_info_linux.cc ('k') | base/test/values_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698