diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 09:19:29 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 09:19:29 +0000 |
| commit | 13b65ccf23ae6c5445ba440895346ac88546d65c (patch) | |
| tree | 8904b816a7d609ad4792980927ff68ad8c65613a /chrome_frame/test/net | |
| parent | d0ad6a23e2fd366f09dfcb31426aa3b858972c9f (diff) | |
| download | chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.zip chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.gz chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 5 |
2 files changed, 5 insertions, 2 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_; |