Changed FileSystemPointProvider::IsAcccessAllowed() to take a single FileSystemURL instead of a tri…

chrome/browser/chromeos/extensions/file_handler_util.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/extensions/file_handler_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_writer.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/extensions/file_browser_handler.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
+#include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
 
 namespace file_handler_util {
@@ skipping 510 matching lines @@
   // Checks legitimacy of file url and grants file RO access permissions from
   // handler (target) extension and its renderer process.
   bool SetupFileAccessPermissions(const GURL& origin_file_url,
                                   FileDefinition* file) {
     if (!handler_extension_.get())
       return false;
 
     if (handler_pid_ == 0)
       return false;
 
-    GURL file_origin_url;
-    FilePath virtual_path;
-    fileapi::FileSystemType type;
-    if (!CrackFileSystemURL(origin_file_url, &file_origin_url, &type,
-                            &virtual_path)) {
+    fileapi::FileSystemURL file_system_url = fileapi::FileSystemURL(
+        origin_file_url);
+    if (!file_system_url.is_valid()) {

[nhiroki (google), 2012/08/24 07:20:03]

nit: can you remove brace?

[calvinlo, 2012/08/24 07:55:09]

Done.

       return false;
     }
 
-    if (type != fileapi::kFileSystemTypeExternal)
+    if (file_system_url.type() != fileapi::kFileSystemTypeExternal)
       return false;
 
     fileapi::ExternalFileSystemMountPointProvider* external_provider =
         file_system_context_->external_provider();
     if (!external_provider)
       return false;
 
-    if (!external_provider->IsAccessAllowed(file_origin_url,
-                                            type,
-                                            virtual_path)) {
+    if (!external_provider->IsAccessAllowed(file_system_url)) {

[nhiroki (google), 2012/08/24 07:20:03]

ditto.

[calvinlo, 2012/08/24 07:55:09]

Done. Sorry, this will take me some time to get used to as you have to add these
for Java according to the Java google3 style. Do we have linting for Chromium to
catch such things?

       return false;
     }
 
     // Make sure this url really being used by the right caller extension.
-    if (source_url_.GetOrigin() != file_origin_url) {
+    if (source_url_.GetOrigin() != file_system_url.origin()) {
       DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
       return false;
     }
 
+    FilePath virtual_path = file_system_url.path();
     FilePath root_path =
         external_provider->GetFileSystemRootPathOnFileThread(
-          file_origin_url,
+          file_system_url.origin(),
           fileapi::kFileSystemTypeExternal,
           virtual_path,
           false);     // create
     FilePath final_file_path = root_path.Append(virtual_path);
 
     // Check if this file system entry exists first.
     base::PlatformFileInfo file_info;
 
     bool is_gdata_file = gdata::util::IsUnderGDataMountPoint(final_file_path);
 
@@ skipping 278 matching lines @@
         handler_pid,
         handler_host_permissions_[i].first,
         handler_host_permissions_[i].second);
   }
 
   // We don't need this anymore.
   handler_host_permissions_.clear();
 }
 
 } // namespace file_handler_util