Move [Homepage,Options,Update,DevTools]URL out of Extension

chrome/common/extensions/extension_file_util.cc

Index: chrome/common/extensions/extension_file_util.cc
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 5a225d88d02e24ce707fb7ef9539a75212f02786..83a55f70a22ad83e53150afabb1df0dfa752a60e 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -21,6 +21,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -375,9 +376,10 @@ bool ValidateExtension(const Extension* extension,
 
   // Validate path to the options page.  Don't check the URL for hosted apps,
   // because they are expected to refer to an external URL.
-  if (!extension->options_url().is_empty() && !extension->is_hosted_app()) {
+  if (!extensions::ExtensionURL::GetOptionsURL(extension).is_empty() &&
+      !extension->is_hosted_app()) {
     const FilePath options_path = ExtensionURLToRelativeFilePath(
-        extension->options_url());
+        extensions::ExtensionURL::GetOptionsURL(extension));
     const FilePath path = extension->GetResource(options_path).GetFilePath();
     if (path.empty() || !file_util::PathExists(path)) {
       *error =