[Pepper] Use platform path for QuotaReservation::GetOpenFileHandle

content/browser/renderer_host/pepper/quota_reservation.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/pepper/quota_reservation.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "content/public/browser/browser_thread.h"
+#include "webkit/browser/fileapi/file_system_operation_runner.h"
 #include "webkit/browser/fileapi/quota/open_file_handle.h"
 #include "webkit/browser/fileapi/quota/quota_reservation.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace content {
 
 // static
 scoped_refptr<QuotaReservation> QuotaReservation::Create(
     scoped_refptr<fileapi::FileSystemContext> file_system_context,
     const GURL& origin_url,
@@ skipping 22 matching lines @@
 }
 
 QuotaReservation::~QuotaReservation() {
   // We should have no open files at this point.
   DCHECK(files_.size() == 0);
   for (FileMap::iterator it = files_.begin(); it != files_.end(); ++ it)
     delete it->second;
 }
 
 int64_t QuotaReservation::OpenFile(int32_t id,
-                                   const base::FilePath& file_path) {
+                                   const fileapi::FileSystemURL& url) {
+  base::FilePath platform_file_path;
+  if (file_system_context_) {
+    base::PlatformFileError error =
+        file_system_context_->operation_runner()->SyncGetPlatformPath(
+            url, &platform_file_path);
+    if (error != base::PLATFORM_FILE_OK) {
+      NOTREACHED();
+      return 0;
+    }
+  } else {
+    // For test.
+    platform_file_path = url.path();
+  }
+
   scoped_ptr<fileapi::OpenFileHandle> file_handle =
-      quota_reservation_->GetOpenFileHandle(file_path);
+      quota_reservation_->GetOpenFileHandle(platform_file_path);
   std::pair<FileMap::iterator, bool> insert_result =
       files_.insert(std::make_pair(id, file_handle.get()));
   if (insert_result.second) {
     int64_t max_written_offset = file_handle->base_file_size();
     ignore_result(file_handle.release());
     return max_written_offset;
   }
   NOTREACHED();
   return 0;
 }
 
 void QuotaReservation::CloseFile(int32_t id,
                                  int64_t max_written_offset) {
   FileMap::iterator it = files_.find(id);
   if (it != files_.end()) {
     it->second->UpdateMaxWrittenOffset(max_written_offset);
+    delete it->second;

[bbudge, 2014/01/10 06:03:13]

Whoa, nice catch.

     files_.erase(it);
   } else {
     NOTREACHED();
   }
 }
 
 void QuotaReservation::ReserveQuota(
     int64_t amount,
     const OffsetMap& max_written_offsets,
     const ReserveQuotaCallback& callback) {
@@ skipping 45 matching lines @@
     file_system_context_->default_file_task_runner()->DeleteSoon(
         FROM_HERE,
         this);
   } else {
     // We're on the right thread to delete, or unit test.
     delete this;
   }
 }
 
 }  // namespace content