- Removes fallback from Prefs to LoadExtension on UI thread.
- Fix extension_service_unittest to actually load extensions from prefs.
BUG=19733
TEST=Remove extension manifest from Preferences file. Extension shouldn't load even if the necessary files are present.
Review URL: http://codereview.chromium.org/339058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30521 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index d681e83d..0234ec5 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_error_reporter.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
@@ -280,11 +281,7 @@
extension = tmp.release();
}
} else {
- // TODO(mpcomplete): obsolete. remove after migration period.
- // http://code.google.com/p/chromium/issues/detail?id=19733
- extension = extension_file_util::LoadExtension(path,
- true, // Require id
- &error);
+ error = extension_manifest_errors::kManifestUnreadable;
}
if (!extension) {
