summaryrefslogtreecommitdiffstats
path: root/base/test/test_timeouts.h
diff options
context:
space:
mode:
authorannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:49:52 +0000
committerannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:49:52 +0000
commit32ba25f8130e85dc5189b06490156c1df4f0cee8 (patch)
treee2427dbc87efb9289315dff1cb416c8f823aac7a /base/test/test_timeouts.h
parent1cf1e69b1ea029d5d99a9b25d9e505cb56170630 (diff)
downloadchromium_src-32ba25f8130e85dc5189b06490156c1df4f0cee8.zip
chromium_src-32ba25f8130e85dc5189b06490156c1df4f0cee8.tar.gz
chromium_src-32ba25f8130e85dc5189b06490156c1df4f0cee8.tar.bz2
Separate BufferedDataSource and BufferedResourceLoader into two files.
It's time to finally separate the huge monster files buffered_data_source.[h/cc] into two. ericroman: There are some variables and short methods that both BufferedDataSource and BufferedResourceLoader rely on and that I have moved to src/net/http/http_util.h. Could you please verify that this is an ok place to put them? Also, appcache issues have been resolved (and approved by michaeln) so I've removed those comments. BUG=None. TEST=Compiles. Review URL: http://codereview.chromium.org/5756004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test/test_timeouts.h')
-rw-r--r--base/test/test_timeouts.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index d49ca2c..f4cb1ff 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -15,6 +15,9 @@ class TestTimeouts {
// by the test suite.
static void Initialize();
+ // Timeout for actions that are expected to finish "almost instantly".
+ static int tiny_timeout_ms() { return tiny_timeout_ms_; }
+
// Timeout to wait for something to happen. If you are not sure
// which timeout to use, this is the one you want.
static int action_timeout_ms() { return action_timeout_ms_; }
@@ -52,6 +55,7 @@ class TestTimeouts {
private:
static bool initialized_;
+ static int tiny_timeout_ms_;
static int action_timeout_ms_;
static int action_max_timeout_ms_;
static int large_test_timeout_ms_;