ChromeOS build fix r117830

BUG=none
TEST=none
TBR=satorux

Review URL: http://codereview.chromium.org/9228003

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

4 files changed, 19 insertions, 11 deletions

diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index a28cf159..61bacd2 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -16,6 +16,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/chromeos/fileapi/file_access_permissions.h"
+#include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/native_file_util.h"
@@ -178,16 +179,18 @@ fileapi::FileSystemFileUtil* CrosMountPointProvider::GetFileUtil() {
   return local_file_util_.get();
 }
 
-FileSystemOperationInterface* CrosMountPointProvider::CreateFileSystemOperation(
+fileapi::FileSystemOperationInterface*
+CrosMountPointProvider::CreateFileSystemOperation(
     const GURL& origin_url,
-    FileSystemType file_system_type,
+    fileapi::FileSystemType file_system_type,
     const FilePath& virtual_path,
-    scoped_ptr<FileSystemCallbackDispatcher> dispatcher,
+    scoped_ptr<fileapi::FileSystemCallbackDispatcher> dispatcher,
     base::MessageLoopProxy* file_proxy,
-    FileSystemContext* context) const {
+    fileapi::FileSystemContext* context) const {
   // TODO(satorux,zel): instantiate appropriate FileSystemOperation that
   // implements async/remote operations.
-  return new FileSystemOperation(dispatcher.Pass(), file_proxy, context);
+  return new fileapi::FileSystemOperation(
+      dispatcher.Pass(), file_proxy, context);
 }
 
 bool CrosMountPointProvider::GetVirtualPath(const FilePath& filesystem_path,
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h
index 8ca6216..a509c11 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.h
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h
@@ -53,13 +53,13 @@ class CrosMountPointProvider
   virtual bool IsRestrictedFileName(const FilePath& filename) const OVERRIDE;
   virtual std::vector<FilePath> GetRootDirectories() const OVERRIDE;
   virtual fileapi::FileSystemFileUtil* GetFileUtil() OVERRIDE;
-  virtual FileSystemOperationInterface* CreateFileSystemOperation(
+  virtual fileapi::FileSystemOperationInterface* CreateFileSystemOperation(
       const GURL& origin_url,
-      FileSystemType file_system_type,
+      fileapi::FileSystemType file_system_type,
       const FilePath& virtual_path,
-      scoped_ptr<FileSystemCallbackDispatcher> dispatcher,
+      scoped_ptr<fileapi::FileSystemCallbackDispatcher> dispatcher,
       base::MessageLoopProxy* file_proxy,
-      FileSystemContext* context) const OVERRIDE;
+      fileapi::FileSystemContext* context) const OVERRIDE;
 
   // fileapi::ExternalFileSystemMountPointProvider overrides.
   virtual void GrantFullAccessToExtension(
diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h
index c51e967..1ea6182 100644
--- a/webkit/fileapi/file_system_mount_point_provider.h
+++ b/webkit/fileapi/file_system_mount_point_provider.h
@@ -9,8 +9,9 @@
 #include <vector>
 
 #include "base/callback_forward.h"
-#include "base/platform_file.h"
 #include "base/file_path.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/platform_file.h"
 #include "base/platform_file.h"
 #include "webkit/fileapi/file_system_types.h"
 
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index 550b54b..fa3161c 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -26,6 +26,10 @@ namespace base {
 class Time;
 }
 
+namespace chromeos {
+class CrosMountPointProvider;
+}
+
 namespace net {
 class URLRequest;
 class URLRequestContext;
@@ -85,8 +89,8 @@ class FileSystemOperation : public FileSystemOperationInterface {
   // Only MountPointProviders or testing class can create a
   // new operation directly.
   friend class SandboxMountPointProvider;
-  friend class CrosMountPointProvider;
   friend class FileSystemTestHelper;
+  friend class chromeos::CrosMountPointProvider;
 
   FileSystemOperation(scoped_ptr<FileSystemCallbackDispatcher> dispatcher,
                       scoped_refptr<base::MessageLoopProxy> proxy,