diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:49:20 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:49:20 +0000 |
| commit | 2086a3da7b13a837035f0df29b12fbb5c49fc120 (patch) | |
| tree | a6ad18e51279f97ca537bb71943bb3af6e6f5755 /chrome_frame | |
| parent | 4ee339187a813ac7d4cb67e2755384a64343c617 (diff) | |
| download | chromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.zip chromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.tar.gz chromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.tar.bz2 | |
Reland 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=wtc@chromium.org,darin@chromium.org
Original Review URL: https://codereview.chromium.org/11369179
Review URL: https://chromiumcodereview.appspot.com/11365227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 5 | ||||
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 00f7659..99c9643 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -752,7 +752,7 @@ void CFUrlRequestUnittestRunner::OnInitializationTimeout() { void CFUrlRequestUnittestRunner::OverrideHttpHost() { override_http_host_.reset( - new ScopedCustomUrlRequestTestHttpHost( + new net::ScopedCustomUrlRequestTestHttpHost( chrome_frame_test::GetLocalIPv4Address())); } diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index 18e24b0..43ae7246 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -23,7 +23,10 @@ class CommandLine; class FakeBrowserProcessImpl; class ProcessSingleton; + +namespace net { class ScopedCustomUrlRequestTestHttpHost; +} // namespace net namespace content { class NotificationService; @@ -122,7 +125,7 @@ class CFUrlRequestUnittestRunner base::ProcessHandle crash_service_; DWORD test_thread_id_; - scoped_ptr<ScopedCustomUrlRequestTestHttpHost> override_http_host_; + scoped_ptr<net::ScopedCustomUrlRequestTestHttpHost> override_http_host_; scoped_ptr<test_server::SimpleWebServer> test_http_server_; test_server::SimpleResponse chrome_frame_html_; diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index f3d7899..54f96a6 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -65,7 +65,7 @@ class TestURLRequest : public net::URLRequest { public: TestURLRequest(const GURL& url, Delegate* delegate, - TestURLRequestContext* context) + net::TestURLRequestContext* context) : net::URLRequest(url, delegate, context) { } }; @@ -81,7 +81,7 @@ class UrlTaskChain { MessageLoopForIO loop; - TestURLRequestContext context; + net::TestURLRequestContext context; TestURLRequest r(GURL(url_), &delegate_, &context); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -103,7 +103,7 @@ class UrlTaskChain { protected: std::string url_; - TestDelegate delegate_; + net::TestDelegate delegate_; UrlTaskChain* next_; }; |