diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:54:36 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:54:36 +0000 |
| commit | d9c2e51c51468cc6c514294d04314bcafc80f468 (patch) | |
| tree | f0acf2c93a84cd98ab96f438da818e0e43e72ae3 /content/browser/resolve_proxy_msg_helper_unittest.cc | |
| parent | 7a91c555f3e057f8be9010a4e5385678ce822c28 (diff) | |
| download | chromium_src-d9c2e51c51468cc6c514294d04314bcafc80f468.zip chromium_src-d9c2e51c51468cc6c514294d04314bcafc80f468.tar.gz chromium_src-d9c2e51c51468cc6c514294d04314bcafc80f468.tar.bz2 | |
Revert 164120 - content/browser: Move more files into the content namespace.
Fixed most of the files found with the following command line:
$ git grep --files-without-match --name-only "namespace content {" -- content/browser/{*.cc,*.h.*.mm}
R=jam@chromium.org
Review URL: https://codereview.chromium.org/11274038
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/11273049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resolve_proxy_msg_helper_unittest.cc')
| -rw-r--r-- | content/browser/resolve_proxy_msg_helper_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index 512e611..7e8470a 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -13,7 +13,8 @@ #include "net/proxy/proxy_service.h" #include "testing/gtest/include/gtest/gtest.h" -namespace content { +using content::BrowserThread; +using content::BrowserThreadImpl; // This ProxyConfigService always returns "http://pac" as the PAC url to use. class MockProxyConfigService : public net::ProxyConfigService { @@ -234,5 +235,3 @@ TEST_F(ResolveProxyMsgHelperTest, CancelPendingRequests) { // It should also be the case that msg1, msg2, msg3 were deleted by the // cancellation. (Else will show up as a leak in Valgrind). } - -} // namespace content |