diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 19:58:00 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 19:58:00 +0000 |
commit | 399ed423f1c7f84190a7030496ac76e9eaf945f6 (patch) | |
tree | 651cc32e6b10cdb5800e5ffd9cb01f4280acac4b /content/public | |
parent | 5f061c2ccd015d5c62b0d95021383e53b47e04c5 (diff) | |
download | chromium_src-399ed423f1c7f84190a7030496ac76e9eaf945f6.zip chromium_src-399ed423f1c7f84190a7030496ac76e9eaf945f6.tar.gz chromium_src-399ed423f1c7f84190a7030496ac76e9eaf945f6.tar.bz2 |
Implement SequenceChecker, which is a generalization of ThreadChecker
SequenceChecker will be used in WeakPtr instead of ThreadChecker, since
WeakPtr needs only the guarantees of a SequencedTaskRunner.
Add NullTaskRunner implementation and make test_browser_context.cc
use it.
BUG=165590
Review URL: https://codereview.chromium.org/11550031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r-- | content/public/test/test_browser_context.cc | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc index 2269812..ec47813 100644 --- a/content/public/test/test_browser_context.cc +++ b/content/public/test/test_browser_context.cc @@ -5,6 +5,7 @@ #include "content/public/test/test_browser_context.h" #include "base/file_path.h" +#include "base/test/null_task_runner.h" #include "content/public/test/mock_resource_context.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -13,39 +14,11 @@ namespace { -// A silly class to satisfy net::URLRequestsContextGetter requirement -// for a task runner. Threading requirements don't matter for this -// test scaffolding. -class AnyThreadNonTaskRunner : public base::SingleThreadTaskRunner { - public: - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { - return true; - } - - virtual bool PostDelayedTask(const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) OVERRIDE { - NOTREACHED(); - return false; - } - - virtual bool PostNonNestableDelayedTask( - const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) OVERRIDE { - NOTREACHED(); - return false; - } - - private: - virtual ~AnyThreadNonTaskRunner() {} -}; - class TestContextURLRequestContextGetter : public net::URLRequestContextGetter { public: explicit TestContextURLRequestContextGetter(net::URLRequestContext* context) : context_(context), - any_thread_non_task_runner_(new AnyThreadNonTaskRunner) { + null_task_runner_(new base::NullTaskRunner) { } virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE { @@ -54,14 +27,14 @@ class TestContextURLRequestContextGetter : public net::URLRequestContextGetter { virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const OVERRIDE { - return any_thread_non_task_runner_; + return null_task_runner_; } private: virtual ~TestContextURLRequestContextGetter() {} net::URLRequestContext* context_; - scoped_refptr<base::SingleThreadTaskRunner> any_thread_non_task_runner_; + scoped_refptr<base::SingleThreadTaskRunner> null_task_runner_; }; } // namespace |