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

7 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
index e82499a..0fa9443 100644
--- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
@@ -104,7 +104,7 @@ TEST(FileSystemUtilTest, ExtractDrivePathFromFileSystemUrl) {
           NULL,  // quota_manager_proxy,
           ScopedVector<fileapi::FileSystemBackend>(),
           temp_dir_.path(),  // partition_path
-          fileapi::CreateAllowFileAccessOptions()));
+          content::CreateAllowFileAccessOptions()));
 
   // Type:"external" + virtual_path:"drive/foo/bar" resolves to "drive/foo/bar".
   const std::string& drive_mount_name =
diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc
index 54b5c14..1233aaf 100644
--- a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc
@@ -215,7 +215,7 @@ class IPhotoFileUtilTest : public testing::Test {
         NULL,
         additional_providers.Pass(),
         profile_dir_.path(),
-        fileapi::CreateAllowFileAccessOptions());
+        content::CreateAllowFileAccessOptions());
   }
 
  protected:
diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
index e0e4a9c..0193fa4 100644
--- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
@@ -183,7 +183,7 @@ class ItunesFileUtilTest : public testing::Test {
         NULL,
         additional_providers.Pass(),
         profile_dir_.path(),
-        fileapi::CreateAllowFileAccessOptions());
+        content::CreateAllowFileAccessOptions());
   }
 
  protected:
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
index 5369338..b591076 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
@@ -108,12 +108,12 @@ class MediaFileValidatorTest : public InProcessBrowserTest {
     ASSERT_TRUE(base::CreateDirectory(src_path));
 
     ScopedVector<fileapi::FileSystemBackend> additional_providers;
-    additional_providers.push_back(new fileapi::TestFileSystemBackend(
+    additional_providers.push_back(new content::TestFileSystemBackend(
         base::MessageLoopProxy::current().get(), src_path));
     additional_providers.push_back(new MediaFileSystemBackend(
         base, base::MessageLoopProxy::current().get()));
     file_system_context_ =
-        fileapi::CreateFileSystemContextWithAdditionalProvidersForTesting(
+        content::CreateFileSystemContextWithAdditionalProvidersForTesting(
             NULL, additional_providers.Pass(), base);
 
     move_src_ = file_system_context_->CreateCrackedFileSystemURL(
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
index dbc1b14..b877d89 100644
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
@@ -134,7 +134,7 @@ class NativeMediaFileUtilTest : public testing::Test {
         NULL,
         additional_providers.Pass(),
         data_dir_.path(),
-        fileapi::CreateAllowFileAccessOptions());
+        content::CreateAllowFileAccessOptions());
 
     filesystem_id_ = isolated_context()->RegisterFileSystemForPath(
         fileapi::kFileSystemTypeNativeMedia, root_path(), NULL);
diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
index 21bfe39..bb91cf1 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
@@ -251,7 +251,7 @@ class PicasaFileUtilTest : public testing::Test {
         NULL,
         additional_providers.Pass(),
         profile_dir_.path(),
-        fileapi::CreateAllowFileAccessOptions());
+        content::CreateAllowFileAccessOptions());
   }
 
   virtual void TearDown() OVERRIDE {
diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
index a7bff60..1b4f065 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
@@ -20,11 +20,11 @@
 #include "webkit/common/quota/quota_types.h"
 
 using base::PlatformFileError;
+using content::SandboxFileSystemTestHelper;
 using fileapi::FileSystemContext;
 using fileapi::FileSystemOperationContext;
 using fileapi::FileSystemURL;
 using fileapi::FileSystemURLSet;
-using fileapi::SandboxFileSystemTestHelper;
 using quota::QuotaManager;
 using quota::QuotaStatusCode;