From c366ad280c032aed580af147b2285d45649ad29b Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Tue, 26 Oct 2010 19:11:38 +0000 Subject: 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 --- chrome/browser/extensions/convert_user_script.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'chrome/browser/extensions/convert_user_script.cc') diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 89caec4..d50bec1 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -24,9 +24,9 @@ namespace keys = extension_manifest_keys; -scoped_refptr ConvertUserScriptToExtension( - const FilePath& user_script_path, const GURL& original_url, - std::string* error) { +Extension* ConvertUserScriptToExtension(const FilePath& user_script_path, + const GURL& original_url, + std::string* error) { std::string content; if (!file_util::ReadFileToString(user_script_path, &content)) { *error = "Could not read source file: " + @@ -138,13 +138,12 @@ scoped_refptr ConvertUserScriptToExtension( return NULL; } - scoped_refptr extension = Extension::Create( - temp_dir.path(), Extension::INTERNAL, *root, false, error); - if (!extension) { + scoped_ptr extension(new Extension(temp_dir.path())); + if (!extension->InitFromValue(*root, false, error)) { NOTREACHED() << "Could not init extension " << *error; return NULL; } temp_dir.Take(); // The caller takes ownership of the directory. - return extension; + return extension.release(); } -- cgit v1.1