diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:25:44 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:25:44 +0000 |
commit | 2c803849c7f516d8da0d1d0a88da53b3102ad631 (patch) | |
tree | 9971a473c62da819715fd7d033f9de1da426051a /webkit/fileapi/file_system_url_request_job_unittest.cc | |
parent | 08039443f7dafbe39df655e45c3d116999fc0f8c (diff) | |
download | chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.zip chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.tar.gz chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.tar.bz2 |
Revert 167337 - Move url_request_test_util into net namespace
This file contains some rather generic names like "TestDelegate". Move it to the
net namespace to avoid collisions
BUG=none
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/11369179
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11410066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_url_request_job_unittest.cc')
-rw-r--r-- | webkit/fileapi/file_system_url_request_job_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index 7297194..2e93374 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -97,7 +97,7 @@ class FileSystemURLRequestJobTest : public testing::Test { void TestRequestHelper(const GURL& url, const net::HttpRequestHeaders* headers, bool run_to_completion) { - delegate_.reset(new net::TestDelegate()); + delegate_.reset(new TestDelegate()); // Make delegate_ exit the MessageLoop when the request is done. delegate_->set_quit_on_complete(true); delegate_->set_quit_on_redirect(true); @@ -205,7 +205,7 @@ class FileSystemURLRequestJobTest : public testing::Test { net::URLRequestContext empty_context_; // NOTE: order matters, request must die before delegate - scoped_ptr<net::TestDelegate> delegate_; + scoped_ptr<TestDelegate> delegate_; scoped_ptr<net::URLRequest> request_; scoped_refptr<net::URLRequestJob> pending_job_; |