Move the parsing of homepage_url" and "devtools_page" out of Extension.

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index cbe9a2d3ac271ec86210ee42fd28ea335778f616..c5bebaf64bdde10797036fb6ef2a28e0eeda02af 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1587,6 +1587,8 @@ bool Extension::InitFromValue(int flags, string16* error) {
     return false;
   }
 
+  finished_parsing_manifest_ = true;
+
   runtime_data_.SetActivePermissions(new PermissionSet(
       this, api_permissions, host_permissions));
   required_permission_set_ = new PermissionSet(
@@ -1594,8 +1596,6 @@ bool Extension::InitFromValue(int flags, string16* error) {
   optional_permission_set_ = new PermissionSet(
       optional_api_permissions, optional_host_permissions, URLPatternSet());
 
-  finished_parsing_manifest_ = true;
-
   return true;
 }
 
@@ -2791,7 +2791,6 @@ bool Extension::LoadExtensionFeatures(APIPermissionSet* api_permissions,
                           &converted_from_user_script_);
 
   if (!LoadManifestHandlerFeatures(error) ||
-      !LoadDevToolsPage(error) ||
       !LoadInputComponents(*api_permissions, error) ||
       !LoadContentScripts(error) ||
       !LoadPageAction(error) ||
@@ -2821,18 +2820,6 @@ bool Extension::LoadManifestHandlerFeatures(string16* error) {
   return true;
 }
 
-bool Extension::LoadDevToolsPage(string16* error) {
-  if (!manifest_->HasKey(keys::kDevToolsPage))
-    return true;
-  std::string devtools_str;
-  if (!manifest_->GetString(keys::kDevToolsPage, &devtools_str)) {
-    *error = ASCIIToUTF16(errors::kInvalidDevToolsPage);
-    return false;
-  }
-  devtools_url_ = GetResourceURL(devtools_str);
-  return true;
-}
-
 bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
                                     string16* error) {
   if (!manifest_->HasKey(keys::kInputComponents))