| Index: chrome/common/extensions/extension.cc | 
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc | 
| index e9e3fc6fc5f1f5cf37e88aa7e935548d09e792fc..097e49f24bae515790934d5d2fb223646e6f4255 100644 | 
| --- a/chrome/common/extensions/extension.cc | 
| +++ b/chrome/common/extensions/extension.cc | 
| @@ -714,14 +714,14 @@ bool Extension::InitFromValue(int flags, string16* error) { | 
| if (!permissions_data_->ParsePermissions(this, error)) | 
| return false; | 
|  | 
| -  if (!LoadSharedFeatures(error)) | 
| -    return false; | 
| - | 
| if (manifest_->HasKey(keys::kConvertedFromUserScript)) { | 
| manifest_->GetBoolean(keys::kConvertedFromUserScript, | 
| &converted_from_user_script_); | 
| } | 
|  | 
| +  if (!LoadSharedFeatures(error)) | 
| +    return false; | 
| + | 
| if (HasMultipleUISurfaces()) { | 
| *error = ASCIIToUTF16(errors::kOneUISurfaceOnly); | 
| return false; | 
|  |