diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 22:56:01 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 22:56:01 +0000 |
| commit | 4473860ddb85d92fb2fda427f4dabd3415c69c43 (patch) | |
| tree | 7d77e45863b029707bb7b78afe2dd8e8fa5f7add /chrome/browser/net/http_pipelining_compatibility_client_unittest.cc | |
| parent | 533e8fe4288e72f87d50479580665b5ec68a8e1b (diff) | |
| download | chromium_src-4473860ddb85d92fb2fda427f4dabd3415c69c43.zip chromium_src-4473860ddb85d92fb2fda427f4dabd3415c69c43.tar.gz chromium_src-4473860ddb85d92fb2fda427f4dabd3415c69c43.tar.bz2 | |
Move TestURLRequestContextGetter to url_request_test_util.{h,cc}
Make everything use this instead of rolling their own.
BUG=113723
TEST=
Review URL: https://chromiumcodereview.appspot.com/9562037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/http_pipelining_compatibility_client_unittest.cc')
| -rw-r--r-- | chrome/browser/net/http_pipelining_compatibility_client_unittest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc index 91608c7..0585795 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc @@ -13,11 +13,11 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "chrome/test/base/test_url_request_context_getter.h" #include "content/test/test_browser_thread.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/url_request/url_request_context_getter.h" +#include "net/url_request/url_request_test_util.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" @@ -43,6 +43,8 @@ enum HistogramField { FIELD_STATUS, }; +using content::BrowserThread; + class HttpPipeliningCompatibilityClientTest : public testing::Test { public: HttpPipeliningCompatibilityClientTest() @@ -50,13 +52,14 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test { net::TestServer::TYPE_HTTP, net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data/http_pipelining"))), - io_thread_(content::BrowserThread::IO, &message_loop_) { + io_thread_(BrowserThread::IO, &message_loop_) { } protected: virtual void SetUp() OVERRIDE { ASSERT_TRUE(test_server_.Start()); - context_ = new TestURLRequestContextGetter; + context_ = new TestURLRequestContextGetter( + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); context_->AddRef(); for (size_t i = 0; i < arraysize(kHistogramNames); ++i) { @@ -69,8 +72,7 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test { } virtual void TearDown() OVERRIDE { - content::BrowserThread::ReleaseSoon(content::BrowserThread::IO, - FROM_HERE, context_); + BrowserThread::ReleaseSoon(BrowserThread::IO, FROM_HERE, context_); message_loop_.RunAllPending(); } |