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

5 files changed, 25 insertions, 18 deletions

diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index d66a273..9f81bba 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -273,10 +273,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   friend class FileSystemOperationRunner;
 
   // For sandbox_backend().
-  friend class SandboxFileSystemTestHelper;
+  friend class content::SandboxFileSystemTestHelper;
 
   // For plugin_private_backend().
-  friend class PluginPrivateFileSystemBackendTest;
+  friend class content::PluginPrivateFileSystemBackendTest;
 
   // Deleters.
   friend struct DefaultContextDeleter;
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h
index 3a90663..4d36c42 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.h
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.h
@@ -19,6 +19,10 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
+namespace content {
+class FileSystemFileStreamReaderTest;
+}
+
 namespace fileapi {
 
 class FileSystemContext;
@@ -41,7 +45,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader
 
  private:
   friend class webkit_blob::FileStreamReader;
-  friend class FileSystemFileStreamReaderTest;
+  friend class content::FileSystemFileStreamReaderTest;
 
   FileSystemFileStreamReader(FileSystemContext* file_system_context,
                              const FileSystemURL& url,
diff --git a/webkit/browser/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h
index 05d5530..7b14779 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.h
+++ b/webkit/browser/fileapi/obfuscated_file_util.h
@@ -29,6 +29,10 @@ class SequencedTaskRunner;
 class TimeTicks;
 }
 
+namespace content {
+class ObfuscatedFileUtilTest;
+}
+
 namespace quota {
 class SpecialStoragePolicy;
 }
@@ -229,17 +233,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE ObfuscatedFileUtil
   typedef SandboxDirectoryDatabase::FileInfo FileInfo;
 
   friend class ObfuscatedFileEnumerator;
-  friend class ObfuscatedFileUtilTest;
   friend class QuotaBackendImplTest;
-  FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, MaybeDropDatabasesAliveCase);
-  FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest,
-                           MaybeDropDatabasesAlreadyDeletedCase);
-  FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest,
-                           DestroyDirectoryDatabase_Isolated);
-  FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest,
-                           GetDirectoryDatabase_Isolated);
-  FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest,
-                           MigrationBackFromIsolated);
+  friend class content::ObfuscatedFileUtilTest;
 
   // Helper method to create an obfuscated file util for regular
   // (temporary, persistent) file systems. Used only for testing.
diff --git a/webkit/browser/fileapi/plugin_private_file_system_backend.h b/webkit/browser/fileapi/plugin_private_file_system_backend.h
index 7f64aa2..8e3f356 100644
--- a/webkit/browser/fileapi/plugin_private_file_system_backend.h
+++ b/webkit/browser/fileapi/plugin_private_file_system_backend.h
@@ -18,6 +18,10 @@ namespace base {
 class SequencedTaskRunner;
 }
 
+namespace content {
+class PluginPrivateFileSystemBackendTest;
+}
+
 namespace quota {
 class SpecialStoragePolicy;
 }
@@ -122,7 +126,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT PluginPrivateFileSystemBackend
       FileSystemType type) const OVERRIDE;
 
  private:
-  friend class PluginPrivateFileSystemBackendTest;
+  friend class content::PluginPrivateFileSystemBackendTest;
 
   ObfuscatedFileUtil* obfuscated_file_util();
   const base::FilePath& base_path() const { return base_path_; }
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
index 7e326b2..9595cda 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
+++ b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
@@ -26,6 +26,11 @@ namespace base {
 class SequencedTaskRunner;
 }
 
+namespace content {
+class SandboxFileSystemBackendDelegateTest;
+class SandboxFileSystemTestHelper;
+}
+
 namespace quota {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
@@ -46,7 +51,6 @@ class FileSystemUsageCache;
 class ObfuscatedFileUtil;
 class QuotaReservationManager;
 class SandboxFileSystemBackend;
-class SandboxFileSystemTestHelper;
 class SandboxQuotaObserver;
 
 // Delegate implementation of the some methods in Sandbox/SyncFileSystemBackend.
@@ -190,10 +194,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
   FileSystemFileUtil* sync_file_util();
 
  private:
-  friend class SandboxQuotaObserver;
-  friend class SandboxFileSystemTestHelper;
   friend class QuotaBackendImpl;
-  FRIEND_TEST_ALL_PREFIXES(SandboxFileSystemBackendDelegateTest, IsAccessValid);
+  friend class SandboxQuotaObserver;
+  friend class content::SandboxFileSystemBackendDelegateTest;
+  friend class content::SandboxFileSystemTestHelper;
 
   // Performs API-specific validity checks on the given path |url|.
   // Returns true if access to |url| is valid in this filesystem.