Add FileSystemID parameter to IsolatedContext::RegisterFileSystemForPath.

content/browser/fileapi/isolated_context_unittest.cc

 // Copyright 2014 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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/file_system_url.h"
@@ skipping 84 matching lines @@
   }
 
   // See if the name of each registered kTestPaths (that is what we
   // register in SetUp() by RegisterDraggedFileSystem) is properly cracked as
   // a valid virtual path in the isolated filesystem.
   for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
     base::FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_)
         .AppendASCII(names_[i]);
     std::string cracked_id;
     base::FilePath cracked_path;
+    std::string cracked_inner_id;
     fileapi::FileSystemType cracked_type;
     FileSystemMountOption cracked_option;
     ASSERT_TRUE(isolated_context()->CrackVirtualPath(
-        virtual_path, &cracked_id, &cracked_type, &cracked_path,
-        &cracked_option));
+        virtual_path, &cracked_id, &cracked_type, &cracked_inner_id,
+        &cracked_path, &cracked_option));
     ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(),
               cracked_path.value());
     ASSERT_EQ(id_, cracked_id);
     ASSERT_EQ(kFileSystemTypeDragged, cracked_type);
+    EXPECT_TRUE(cracked_inner_id.empty());
   }
 
   // Make sure GetRegisteredPath returns false for id_ since it is
   // registered for dragged files.
   base::FilePath path;
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
 
   // Deref the current one and registering a new one.
   isolated_context()->RemoveReference(id_);
 
   std::string id2 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, base::FilePath(DRIVE FPL("/foo")), NULL);
+      kFileSystemTypeNativeLocal, std::string(),
+      base::FilePath(DRIVE FPL("/foo")), NULL);
 
   // Make sure the GetDraggedFileInfo returns false for both ones.
   ASSERT_FALSE(isolated_context()->GetDraggedFileInfo(id2, &toplevels));
   ASSERT_FALSE(isolated_context()->GetDraggedFileInfo(id_, &toplevels));
 
   // Make sure the GetRegisteredPath returns true only for the new one.
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id_, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id2, &path));
 
   // Try registering three more file systems for the same path as id2.
   std::string id3 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, path, NULL);
+      kFileSystemTypeNativeLocal, std::string(), path, NULL);
   std::string id4 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, path, NULL);
+      kFileSystemTypeNativeLocal, std::string(), path, NULL);
   std::string id5 = isolated_context()->RegisterFileSystemForPath(
-      kFileSystemTypeNativeLocal, path, NULL);
+      kFileSystemTypeNativeLocal, std::string(), path, NULL);
 
   // Remove file system for id4.
   isolated_context()->AddReference(id4);
   isolated_context()->RemoveReference(id4);
 
   // Only id4 should become invalid now.
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id2, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id3, &path));
   ASSERT_FALSE(isolated_context()->GetRegisteredPath(id4, &path));
   ASSERT_TRUE(isolated_context()->GetRegisteredPath(id5, &path));
@@ skipping 42 matching lines @@
   for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(relatives); ++j) {
       SCOPED_TRACE(testing::Message() << "Testing "
                    << kTestPaths[i].value() << " " << relatives[j].path);
       base::FilePath virtual_path =
           isolated_context()->CreateVirtualRootPath(id_).AppendASCII(
               names_[i]).Append(relatives[j].path);
       std::string cracked_id;
       base::FilePath cracked_path;
       fileapi::FileSystemType cracked_type;
+      std::string cracked_inner_id;
       FileSystemMountOption cracked_option;
       if (!relatives[j].valid) {
         ASSERT_FALSE(isolated_context()->CrackVirtualPath(
-            virtual_path, &cracked_id, &cracked_type, &cracked_path,
-            &cracked_option));
+            virtual_path, &cracked_id, &cracked_type, &cracked_inner_id,
+            &cracked_path, &cracked_option));
         continue;
       }
       ASSERT_TRUE(isolated_context()->CrackVirtualPath(
-          virtual_path, &cracked_id, &cracked_type, &cracked_path,
-          &cracked_option));
+          virtual_path, &cracked_id, &cracked_type, &cracked_inner_id,
+          &cracked_path, &cracked_option));
       ASSERT_EQ(kTestPaths[i].Append(relatives[j].path)
                     .NormalizePathSeparators().value(),
                 cracked_path.value());
       ASSERT_EQ(id_, cracked_id);
       ASSERT_EQ(kFileSystemTypeDragged, cracked_type);
+      EXPECT_TRUE(cracked_inner_id.empty());
     }
   }
 }
 
 TEST_F(IsolatedContextTest, CrackURLWithRelativePaths) {
   const struct {
     base::FilePath::StringType path;
     bool valid;
   } relatives[] = {
     { FPL("foo"), true },
@@ skipping 40 matching lines @@
 TEST_F(IsolatedContextTest, TestWithVirtualRoot) {
   std::string cracked_id;
   base::FilePath cracked_path;
   FileSystemMountOption cracked_option;
 
   // Trying to crack virtual root "/" returns true but with empty cracked path
   // as "/" of the isolated filesystem is a pure virtual directory
   // that has no corresponding platform directory.
   base::FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_);
   ASSERT_TRUE(isolated_context()->CrackVirtualPath(
-      virtual_path, &cracked_id, NULL, &cracked_path, &cracked_option));
+      virtual_path, &cracked_id, NULL, NULL, &cracked_path, &cracked_option));
   ASSERT_EQ(FPL(""), cracked_path.value());
   ASSERT_EQ(id_, cracked_id);
 
   // Trying to crack "/foo" should fail (because "foo" is not the one
   // included in the kTestPaths).
   virtual_path = isolated_context()->CreateVirtualRootPath(
       id_).AppendASCII("foo");
   ASSERT_FALSE(isolated_context()->CrackVirtualPath(
-      virtual_path, &cracked_id, NULL, &cracked_path, &cracked_option));
+      virtual_path, &cracked_id, NULL, NULL, &cracked_path, &cracked_option));
 }
 
 TEST_F(IsolatedContextTest, CanHandleURL) {
   const GURL test_origin("http://chromium.org");
   const base::FilePath test_path(FPL("/mount"));
 
   // Should handle isolated file system.
   EXPECT_TRUE(isolated_context()->HandlesFileSystemMountType(
       fileapi::kFileSystemTypeIsolated));
 
@@ skipping 36 matching lines @@
 
   base::FilePath test_virtual_path =
       base::FilePath().AppendASCII("virtualdir").AppendASCII("virtualfile.txt");
 
   base::FilePath whole_virtual_path =
       isolated_context()->CreateVirtualRootPath(database_fsid)
           .AppendASCII("_").Append(test_virtual_path);
 
   std::string cracked_id;
   base::FilePath cracked_path;
+  std::string cracked_inner_id;
   FileSystemMountOption cracked_option;
   ASSERT_TRUE(isolated_context()->CrackVirtualPath(
-      whole_virtual_path, &cracked_id, NULL, &cracked_path, &cracked_option));
+      whole_virtual_path, &cracked_id, NULL, &cracked_inner_id,
+      &cracked_path, &cracked_option));
   ASSERT_EQ(database_fsid, cracked_id);
   ASSERT_EQ(test_virtual_path, cracked_path);
+  EXPECT_TRUE(cracked_inner_id.empty());
 }
 
 }  // namespace content