diff options
author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 12:41:29 +0000 |
---|---|---|
committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 12:41:29 +0000 |
commit | a14b16bd4b6d7fc3c1e3e83f16d1d59bc05f3dab (patch) | |
tree | b9f147f90989125906bc77282d41f166c57bb959 /chrome/common/extensions/extension_resource_unittest.cc | |
parent | c3b4463c325d5a7f512130c02a68913cc52d20fe (diff) | |
download | chromium_src-a14b16bd4b6d7fc3c1e3e83f16d1d59bc05f3dab.zip chromium_src-a14b16bd4b6d7fc3c1e3e83f16d1d59bc05f3dab.tar.gz chromium_src-a14b16bd4b6d7fc3c1e3e83f16d1d59bc05f3dab.tar.bz2 |
Get rid of FilePath::AppendAndResolveRelative().
To resolve the problem of '..' parent references as well as symbolic links on POSIX platforms, we can simply use the file_util::AbsolutePath() function.
This has the drawback of having a different behavior on Windows and POSIX platforms, in the way that it can return a canonical path that doesn't exists when ran on Windows, but it will return an empty path (or false) when run on a POSIX platform.
So we need to add an extra PathExists() call to unify the behavior.
BUG=25681,25131
Review URL: http://codereview.chromium.org/343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_resource_unittest.cc')
-rw-r--r-- | chrome/common/extensions/extension_resource_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc index f467e47..807452e 100644 --- a/chrome/common/extensions/extension_resource_unittest.cc +++ b/chrome/common/extensions/extension_resource_unittest.cc @@ -35,12 +35,10 @@ TEST(ExtensionResourceTest, CreateWithMissingResourceOnDisk) { relative_path = relative_path.AppendASCII("cira.js"); ExtensionResource resource(root_path, relative_path); + // The path doesn't exist on disk, we will be returned an empty path. EXPECT_EQ(root_path.value(), resource.extension_root().value()); EXPECT_EQ(relative_path.value(), resource.relative_path().value()); - EXPECT_EQ(ToLower(root_path.Append(relative_path).value()), - ToLower(resource.GetFilePath().value())); - - EXPECT_FALSE(resource.GetFilePath().empty()); + EXPECT_TRUE(resource.GetFilePath().empty()); } TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) { @@ -76,6 +74,7 @@ TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) { ASSERT_FALSE(locales.empty()); FilePath expected_path; expected_path = l10n_path.AppendASCII(locales[0]).AppendASCII(filename); + ASSERT_TRUE(file_util::AbsolutePath(&expected_path)); EXPECT_EQ(ToLower(expected_path.value()), ToLower(resolved_path.value())); EXPECT_EQ(ToLower(temp.path().value()), |