summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_ui_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/extensions/extension_ui_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/extensions/extension_ui_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_ui_unittest.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index 1bda60a..ba429ba 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -33,6 +33,7 @@ namespace {
#elif defined(OS_POSIX)
FilePath path(FILE_PATH_LITERAL("/foo"));
#endif
+ Extension extension(path);
std::string error;
FilePath manifest_path = extension_path.Append(
@@ -40,10 +41,7 @@ namespace {
scoped_ptr<DictionaryValue> extension_data(DeserializeJSONTestData(
manifest_path, &error));
EXPECT_EQ("", error);
-
- scoped_refptr<Extension> extension(Extension::Create(
- path, Extension::INVALID, *extension_data, true, &error));
- EXPECT_TRUE(extension.get());
+ EXPECT_TRUE(extension.InitFromValue(*extension_data, true, &error));
EXPECT_EQ("", error);
scoped_ptr<DictionaryValue> expected_output_data(DeserializeJSONTestData(
@@ -52,7 +50,7 @@ namespace {
// Produce test output.
scoped_ptr<DictionaryValue> actual_output_data(
- ExtensionsDOMHandler::CreateExtensionDetailValue(NULL, extension.get(),
+ ExtensionsDOMHandler::CreateExtensionDetailValue(NULL, &extension,
pages, true));
// Compare the outputs.