summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/test_extension_prefs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/test_extension_prefs.cc')
-rw-r--r--chrome/browser/extensions/test_extension_prefs.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 2cbb2d1..a32f847 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -45,25 +45,22 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
prefs_.reset(new ExtensionPrefs(pref_service_.get(), temp_dir_.path()));
}
-scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) {
+Extension* TestExtensionPrefs::AddExtension(std::string name) {
DictionaryValue dictionary;
dictionary.SetString(extension_manifest_keys::kName, name);
dictionary.SetString(extension_manifest_keys::kVersion, "0.1");
return AddExtensionWithManifest(dictionary, Extension::INTERNAL);
}
-scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifest(
+Extension* TestExtensionPrefs::AddExtensionWithManifest(
const DictionaryValue& manifest, Extension::Location location) {
std::string name;
EXPECT_TRUE(manifest.GetString(extension_manifest_keys::kName, &name));
FilePath path = extensions_dir_.AppendASCII(name);
+ Extension* extension = new Extension(path);
std::string errors;
- scoped_refptr<Extension> extension = Extension::Create(
- path, location, manifest, false, &errors);
- EXPECT_TRUE(extension);
- if (!extension)
- return NULL;
-
+ extension->set_location(location);
+ EXPECT_TRUE(extension->InitFromValue(manifest, false, &errors));
EXPECT_TRUE(Extension::IdIsValid(extension->id()));
const bool kInitialIncognitoEnabled = false;
prefs_->OnExtensionInstalled(extension, Extension::ENABLED,
@@ -72,6 +69,6 @@ scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifest(
}
std::string TestExtensionPrefs::AddExtensionAndReturnId(std::string name) {
- scoped_refptr<Extension> extension(AddExtension(name));
+ scoped_ptr<Extension> extension(AddExtension(name));
return extension->id();
}