[fsp] Let extensions decide about the file system id.

chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.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 "chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
 #include "chrome/browser/chromeos/file_system_provider/request_manager.h"
 #include "chrome/browser/chromeos/file_system_provider/request_value.h"
 #include "chrome/browser/chromeos/file_system_provider/service.h"
 #include "chrome/common/extensions/api/file_system_provider.h"
 #include "chrome/common/extensions/api/file_system_provider_internal.h"
 
 using chromeos::file_system_provider::ProvidedFileSystemInterface;
 using chromeos::file_system_provider::RequestValue;
 using chromeos::file_system_provider::Service;
 
 namespace extensions {
 
 bool FileSystemProviderMountFunction::RunSync() {
   using api::file_system_provider::Mount::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
+  // It's an error if the file system Id is empty.
+  if (params->file_system_id.empty()) {
+    base::ListValue* result = new base::ListValue();
+    result->Append(CreateError(kSecurityErrorName, kEmptyIdErrorMessage));
+    SetResult(result);
+    return true;
+  }
+
   // It's an error if the display name is empty.
   if (params->display_name.empty()) {
     base::ListValue* result = new base::ListValue();
-    result->Append(new base::StringValue(""));
     result->Append(CreateError(kSecurityErrorName,
                                kEmptyNameErrorMessage));
     SetResult(result);
     return true;
   }
 
   Service* service = Service::Get(GetProfile());
   DCHECK(service);
   if (!service)
     return false;
 
-  int file_system_id =
-      service->MountFileSystem(extension_id(), params->display_name);
-
-  // If the |file_system_id| is zero, then it means that registering the file
-  // system failed.
   // TODO(mtomasz): Pass more detailed errors, rather than just a bool.
-  if (!file_system_id) {
+  if (!service->MountFileSystem(
+          extension_id(), params->file_system_id, params->display_name)) {
     base::ListValue* result = new base::ListValue();
-    result->Append(new base::FundamentalValue(0));
     result->Append(CreateError(kSecurityErrorName, kMountFailedErrorMessage));
     SetResult(result);
     return true;
   }
 
   base::ListValue* result = new base::ListValue();
-  result->Append(new base::FundamentalValue(file_system_id));
-  // Don't append an error on success.
-
   SetResult(result);
   return true;
 }
 
 bool FileSystemProviderUnmountFunction::RunSync() {
   using api::file_system_provider::Unmount::Params;
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   Service* service = Service::Get(GetProfile());
@@ skipping 132 matching lines @@
 bool FileSystemProviderInternalReadFileRequestedErrorFunction::RunWhenValid() {
   using api::file_system_provider_internal::ReadFileRequestedError::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   RejectRequest(ProviderErrorToFileError(params->error));
   return true;
 }
 
 }  // namespace extensions