summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes/browser_theme_pack_unittest.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 19:11:38 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 19:11:38 +0000
commitc366ad280c032aed580af147b2285d45649ad29b (patch)
tree8aef07bf9b5b862e1c623826c527492c9fe12dee /chrome/browser/themes/browser_theme_pack_unittest.cc
parentd6b3999f71631506c1b390707f205929bdfa221e (diff)
downloadchromium_src-c366ad280c032aed580af147b2285d45649ad29b.zip
chromium_src-c366ad280c032aed580af147b2285d45649ad29b.tar.gz
chromium_src-c366ad280c032aed580af147b2285d45649ad29b.tar.bz2
Revert r63919 "Part 2 of immutable Extension refactor."
Compile failure on Linux x64. BUG=56558 TEST=no functional change TBR=aa Review URL: http://codereview.chromium.org/4156002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/browser_theme_pack_unittest.cc')
-rw-r--r--chrome/browser/themes/browser_theme_pack_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 5da6acf..87fc2c7 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -397,6 +397,8 @@ TEST_F(BrowserThemePackTest, CanBuildAndReadPack) {
// Part 1: Build the pack from an extension.
{
FilePath star_gazing_path = GetStarGazingPath();
+ Extension extension(star_gazing_path);
+
FilePath manifest_path =
star_gazing_path.AppendASCII("manifest.json");
std::string error;
@@ -405,13 +407,11 @@ TEST_F(BrowserThemePackTest, CanBuildAndReadPack) {
static_cast<DictionaryValue*>(serializer.Deserialize(NULL, &error)));
EXPECT_EQ("", error);
ASSERT_TRUE(valid_value.get());
- scoped_refptr<Extension> extension(Extension::Create(
- star_gazing_path, Extension::INVALID, *valid_value, true, &error));
- ASSERT_TRUE(extension.get());
+ ASSERT_TRUE(extension.InitFromValue(*valid_value, true, &error));
ASSERT_EQ("", error);
scoped_refptr<BrowserThemePack> pack =
- BrowserThemePack::BuildFromExtension(extension.get());
+ BrowserThemePack::BuildFromExtension(&extension);
ASSERT_TRUE(pack.get());
ASSERT_TRUE(pack->WriteToDisk(file));
VerifyStarGazing(pack.get());