Add FileSystemID parameter to IsolatedContext::RegisterFileSystemForPath.

content/browser/fileapi/external_mount_points_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 "webkit/browser/fileapi/external_mount_points.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 438 matching lines @@
     { FPL("c/d\\e"),
       true, fileapi::kFileSystemTypeNativeLocal, DRIVE FPL("/a/b/c/d/e"), "c" },
     { FPL("mount\\a\\b"),
       true, fileapi::kFileSystemTypeDrive, DRIVE FPL("/root/a/b"), "mount" },
 #endif
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
     std::string cracked_name;
     fileapi::FileSystemType cracked_type;
+    std::string cracked_id;
     base::FilePath cracked_path;
     fileapi::FileSystemMountOption cracked_option;
     EXPECT_EQ(kTestCases[i].expect_valid,
               mount_points->CrackVirtualPath(base::FilePath(kTestCases[i].path),
-                  &cracked_name, &cracked_type, &cracked_path, &cracked_option))
+                  &cracked_name, &cracked_type, &cracked_id, &cracked_path,
+                  &cracked_option))
         << "Test case index: " << i;
 
     if (!kTestCases[i].expect_valid)
       continue;
 
     EXPECT_EQ(kTestCases[i].expect_type, cracked_type)
         << "Test case index: " << i;
     EXPECT_EQ(base::FilePath(
         kTestCases[i].expect_path).NormalizePathSeparators(), cracked_path)
         << "Test case index: " << i;
     EXPECT_EQ(kTestCases[i].expect_name, cracked_name)
         << "Test case index: " << i;
+    // As of now we don't mount other filesystems with non-empty filesystem_id
+    // onto external mount points.
+    EXPECT_TRUE(cracked_id.empty()) << "Test case index: " << i;
   }
 }
 
 TEST(ExternalMountPointsTest, MountOption) {
   scoped_refptr<fileapi::ExternalMountPoints> mount_points(
       fileapi::ExternalMountPoints::CreateRefCounted());
 
   mount_points->RegisterFileSystem(
       "nosync",
       fileapi::kFileSystemTypeNativeLocal,
       fileapi::FileSystemMountOption(fileapi::COPY_SYNC_OPTION_NO_SYNC),
       base::FilePath(DRIVE FPL("/nosync")));
   mount_points->RegisterFileSystem(
       "sync",
       fileapi::kFileSystemTypeNativeLocal,
       fileapi::FileSystemMountOption(fileapi::COPY_SYNC_OPTION_SYNC),
       base::FilePath(DRIVE FPL("/sync")));
 
   std::string name;
   fileapi::FileSystemType type;
+  std::string cracked_id;
   fileapi::FileSystemMountOption option;
   base::FilePath path;
   EXPECT_TRUE(mount_points->CrackVirtualPath(
-      base::FilePath(FPL("nosync/file")), &name, &type, &path, &option));
+      base::FilePath(FPL("nosync/file")), &name, &type, &cracked_id, &path,
+      &option));
   EXPECT_EQ(fileapi::COPY_SYNC_OPTION_NO_SYNC, option.copy_sync_option());
   EXPECT_TRUE(mount_points->CrackVirtualPath(
-      base::FilePath(FPL("sync/file")), &name, &type, &path, &option));
+      base::FilePath(FPL("sync/file")), &name, &type, &cracked_id, &path,
+      &option));
   EXPECT_EQ(fileapi::COPY_SYNC_OPTION_SYNC, option.copy_sync_option());
 }
 
 }  // namespace content