Change fileapi namespace to content for test files that are moved under content/

Note that this temporarily adds some content:: notion in webkit/ (mostly for friend'ing / forward decls)

This also includes some refactoring in some test code (namely obfuscated_file_util_unittest.cc) to work around
cross-namespace friend'ing.

BUG=265769
TEST=build
TBR=mmenke

Review URL: https://codereview.chromium.org/137923003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245232 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 16 deletions

diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 5637d42..7c8e1a9 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -53,21 +53,11 @@ class AppCacheURLRequestJobTest;
 // Temporary layering violation to allow existing users of a deprecated
 // interface.
 namespace content {
-class ResourceDispatcherHostTest;
-}
-
-// Temporary layering violation to allow existing users of a deprecated
-// interface.
-namespace fileapi {
+class BlobURLRequestJobTest;
 class FileSystemDirURLRequestJobTest;
 class FileSystemURLRequestJobTest;
 class FileWriterDelegateTest;
-}
-
-// Temporary layering violation to allow existing users of a deprecated
-// interface.
-namespace webkit_blob {
-class BlobURLRequestJobTest;
+class ResourceDispatcherHostTest;
 }
 
 namespace net {
@@ -180,11 +170,11 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
     friend class appcache::AppCacheInterceptor;
     friend class appcache::AppCacheRequestHandlerTest;
     friend class appcache::AppCacheURLRequestJobTest;
+    friend class content::BlobURLRequestJobTest;
+    friend class content::FileSystemDirURLRequestJobTest;
+    friend class content::FileSystemURLRequestJobTest;
+    friend class content::FileWriterDelegateTest;
     friend class content::ResourceDispatcherHostTest;
-    friend class fileapi::FileSystemDirURLRequestJobTest;
-    friend class fileapi::FileSystemURLRequestJobTest;
-    friend class fileapi::FileWriterDelegateTest;
-    friend class webkit_blob::BlobURLRequestJobTest;
 
     // Use URLRequestJobFactory::ProtocolHandler instead.
     static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme,