diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 06:46:10 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 06:46:10 +0000 |
commit | 4930760d08e0d3afef5e99684fc7450b15d0cf78 (patch) | |
tree | d4d02e538c145096e8ba74bc8cb34a72a6d83647 /chrome/common/extensions/extension_resource_unittest.cc | |
parent | 022a8ca1d96755b98c26c6211968415fe7c2f458 (diff) | |
download | chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.zip chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.gz chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.bz2 |
Revert r50779 as it breaks memory tests
TBR=asargent@chromium.org
TEST=Tree goes green
Review URL: http://codereview.chromium.org/2812025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50828 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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc index 189e4d6..258227f 100644 --- a/chrome/common/extensions/extension_resource_unittest.cc +++ b/chrome/common/extensions/extension_resource_unittest.cc @@ -33,9 +33,7 @@ TEST(ExtensionResourceTest, CreateWithMissingResourceOnDisk) { ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &root_path)); FilePath relative_path; relative_path = relative_path.AppendASCII("cira.js"); - std::string extension_id; - Extension::GenerateId("test", &extension_id); - ExtensionResource resource(extension_id, root_path, relative_path); + 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()); @@ -70,10 +68,7 @@ TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) { } FilePath path; - std::string extension_id; - Extension::GenerateId("test", &extension_id); - ExtensionResource resource(extension_id, temp.path(), - FilePath().AppendASCII(filename)); + ExtensionResource resource(temp.path(), FilePath().AppendASCII(filename)); FilePath resolved_path = resource.GetFilePath(); FilePath expected_path; |