summaryrefslogtreecommitdiffstats
path: root/chrome/service
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 22:56:01 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 22:56:01 +0000
commit4473860ddb85d92fb2fda427f4dabd3415c69c43 (patch)
tree7d77e45863b029707bb7b78afe2dd8e8fa5f7add /chrome/service
parent533e8fe4288e72f87d50479580665b5ec68a8e1b (diff)
downloadchromium_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/service')
-rw-r--r--chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc26
1 files changed, 7 insertions, 19 deletions
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
index 11be40d..5103ec8 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
@@ -26,31 +26,18 @@ namespace {
const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
int g_request_context_getter_instances = 0;
-class TestURLRequestContextGetter : public net::URLRequestContextGetter {
+class TrackingTestURLRequestContextGetter
+ : public TestURLRequestContextGetter {
public:
- explicit TestURLRequestContextGetter(
+ explicit TrackingTestURLRequestContextGetter(
base::MessageLoopProxy* io_message_loop_proxy)
- : io_message_loop_proxy_(io_message_loop_proxy) {
+ : TestURLRequestContextGetter(io_message_loop_proxy) {
g_request_context_getter_instances++;
}
- virtual net::URLRequestContext* GetURLRequestContext() {
- if (!context_)
- context_ = new TestURLRequestContext();
- return context_;
- }
- virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const {
- return io_message_loop_proxy_;
- }
-
protected:
- scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
-
- private:
- virtual ~TestURLRequestContextGetter() {
+ virtual ~TrackingTestURLRequestContextGetter() {
g_request_context_getter_instances--;
}
-
- scoped_refptr<net::URLRequestContext> context_;
};
class TestCloudPrintURLFetcher : public CloudPrintURLFetcher {
@@ -61,7 +48,8 @@ class TestCloudPrintURLFetcher : public CloudPrintURLFetcher {
}
virtual net::URLRequestContextGetter* GetRequestContextGetter() {
- return new TestURLRequestContextGetter(io_message_loop_proxy_.get());
+ return new TrackingTestURLRequestContextGetter(
+ io_message_loop_proxy_.get());
}
private:
scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;