diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 03:12:54 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 03:12:54 +0000 |
| commit | 9d5d6986dfaed15ef3719250fbf7fb8347bebd80 (patch) | |
| tree | a472d1593efc197e15d9474d26e93530b939ec7f /webkit/fileapi/isolated_context_unittest.cc | |
| parent | d22af016d12e789ac7c5976c300c819ebe4340b3 (diff) | |
| download | chromium_src-9d5d6986dfaed15ef3719250fbf7fb8347bebd80.zip chromium_src-9d5d6986dfaed15ef3719250fbf7fb8347bebd80.tar.gz chromium_src-9d5d6986dfaed15ef3719250fbf7fb8347bebd80.tar.bz2 | |
Extract external file systems handling from isolated context.
Move mount point info bookeeping from CrosMountPointProvider to ExternalMountPoints.
Add some tests for CrosMountPointProvider.
BUG=158837
TEST=content_unittests:CrosMountPointProvider*
TBR=benwells@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11648027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/isolated_context_unittest.cc')
| -rw-r--r-- | webkit/fileapi/isolated_context_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/fileapi/isolated_context_unittest.cc b/webkit/fileapi/isolated_context_unittest.cc index 78efd16..bf36df9 100644 --- a/webkit/fileapi/isolated_context_unittest.cc +++ b/webkit/fileapi/isolated_context_unittest.cc @@ -19,7 +19,7 @@ namespace fileapi { -typedef IsolatedContext::FileInfo FileInfo; +typedef IsolatedContext::MountPointInfo FileInfo; namespace { @@ -95,7 +95,7 @@ TEST_F(IsolatedContextTest, RegisterAndRevokeTest) { std::string cracked_id; FilePath cracked_path; FileSystemType cracked_type; - ASSERT_TRUE(isolated_context()->CrackIsolatedPath( + ASSERT_TRUE(isolated_context()->CrackVirtualPath( virtual_path, &cracked_id, &cracked_type, &cracked_path)); ASSERT_EQ(kTestPaths[i].NormalizePathSeparators().value(), cracked_path.value()); @@ -191,11 +191,11 @@ TEST_F(IsolatedContextTest, CrackWithRelativePaths) { FilePath cracked_path; FileSystemType cracked_type; if (!relatives[j].valid) { - ASSERT_FALSE(isolated_context()->CrackIsolatedPath( + ASSERT_FALSE(isolated_context()->CrackVirtualPath( virtual_path, &cracked_id, &cracked_type, &cracked_path)); continue; } - ASSERT_TRUE(isolated_context()->CrackIsolatedPath( + ASSERT_TRUE(isolated_context()->CrackVirtualPath( virtual_path, &cracked_id, &cracked_type, &cracked_path)); ASSERT_EQ(kTestPaths[i].Append(relatives[j].path) .NormalizePathSeparators().value(), @@ -214,7 +214,7 @@ TEST_F(IsolatedContextTest, TestWithVirtualRoot) { // as "/" of the isolated filesystem is a pure virtual directory // that has no corresponding platform directory. FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_); - ASSERT_TRUE(isolated_context()->CrackIsolatedPath( + ASSERT_TRUE(isolated_context()->CrackVirtualPath( virtual_path, &cracked_id, NULL, &cracked_path)); ASSERT_EQ(FPL(""), cracked_path.value()); ASSERT_EQ(id_, cracked_id); @@ -223,7 +223,7 @@ TEST_F(IsolatedContextTest, TestWithVirtualRoot) { // included in the kTestPaths). virtual_path = isolated_context()->CreateVirtualRootPath( id_).AppendASCII("foo"); - ASSERT_FALSE(isolated_context()->CrackIsolatedPath( + ASSERT_FALSE(isolated_context()->CrackVirtualPath( virtual_path, &cracked_id, NULL, &cracked_path)); } |