Don't allow multiple opens for Pepper FileSystem.

BUG=73667
TEST=test_file_system.{h,cc}

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

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

2 files changed, 9 insertions, 3 deletions

diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.cc b/webkit/plugins/ppapi/ppb_file_system_impl.cc
index 04fc1ae..4abd269 100644
--- a/webkit/plugins/ppapi/ppb_file_system_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_system_impl.cc
@@ -56,8 +56,10 @@ int32_t Open(PP_Resource file_system_id,
   if (!file_system)
     return PP_ERROR_BADRESOURCE;
 
-  if (file_system->opened())
-    return PP_OK;
+  // Should not allow multiple opens.
+  if (file_system->called_open())
+    return PP_ERROR_FAILED;
+  file_system->set_called_open();
 
   if ((file_system->type() != PP_FILESYSTEMTYPE_LOCALPERSISTENT) &&
       (file_system->type() != PP_FILESYSTEMTYPE_LOCALTEMPORARY))
@@ -100,7 +102,8 @@ PPB_FileSystem_Impl::PPB_FileSystem_Impl(PluginInstance* instance,
     : Resource(instance),
       instance_(instance),
       type_(type),
-      opened_(false) {
+      opened_(false),
+      called_open_(false) {
   DCHECK(type_ != PP_FILESYSTEMTYPE_INVALID);
 }
 
diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.h b/webkit/plugins/ppapi/ppb_file_system_impl.h
index 2b3e7af..3ee3756 100644
--- a/webkit/plugins/ppapi/ppb_file_system_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_system_impl.h
@@ -32,12 +32,15 @@ class PPB_FileSystem_Impl : public Resource {
   void set_root_path(const FilePath& root_path) { root_path_ = root_path; }
   bool opened() const { return opened_; }
   void set_opened(bool opened) { opened_ = opened; }
+  bool called_open() const { return called_open_; }
+  void set_called_open() { called_open_ = true; }
 
  private:
   PluginInstance* instance_;
   PP_FileSystemType_Dev type_;
   FilePath root_path_;
   bool opened_;
+  bool called_open_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_FileSystem_Impl);
 };