Index: chrome/browser/extensions/extension_browsertest.cc |
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc |
index 101e5241b24465e2c02dcd37bb51d8c8d3c83f98..5e493596095355d901755fa0549b3ea070bd1917 100644 |
--- a/chrome/browser/extensions/extension_browsertest.cc |
+++ b/chrome/browser/extensions/extension_browsertest.cc |
@@ -142,17 +142,21 @@ const Extension* ExtensionBrowserTest::LoadExtensionIncognito( |
return LoadExtensionWithOptions(path, true, true); |
} |
-bool ExtensionBrowserTest::LoadExtensionAsComponent(const FilePath& path) { |
+const Extension* ExtensionBrowserTest::LoadExtensionAsComponent( |
+ const FilePath& path) { |
ExtensionService* service = browser()->profile()->GetExtensionService(); |
std::string manifest; |
if (!file_util::ReadFileToString(path.Append(Extension::kManifestFilename), |
&manifest)) |
- return false; |
- |
- service->component_loader()->Add(manifest, path); |
+ return NULL; |
- return true; |
+ const Extension* extension = |
+ service->component_loader()->Add(manifest, path); |
+ if (!extension) |
+ return NULL; |
+ last_loaded_extension_id_ = extension->id(); |
+ return extension; |
} |
FilePath ExtensionBrowserTest::PackExtension(const FilePath& dir_path) { |