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

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 90712947cf3d6c9d0ca1a92e43a5ba92986b041a..9d236e97fad202ddefeb7f797bac58a3dde1933d 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -42,6 +42,7 @@
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -149,8 +150,9 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
                              extension->location() == Extension::LOAD);
   extension_data->SetBoolean("is_hosted_app", extension->is_hosted_app());
   extension_data->SetBoolean("is_platform_app", extension->is_platform_app());
-  extension_data->SetBoolean("homepageProvided",
-                             extension->GetHomepageURL().is_valid());
+  extension_data->SetBoolean(
+      "homepageProvided",
+      extensions::ExtensionURL::GetHomepageURL(extension).is_valid());
 
   string16 automatically_disabled_text;
   int disable_reasons =
@@ -783,8 +785,10 @@ void ExtensionSettingsHandler::HandleUninstallMessage(const ListValue* args) {
 
 void ExtensionSettingsHandler::HandleOptionsMessage(const ListValue* args) {
   const Extension* extension = GetActiveExtension(args);
-  if (!extension || extension->options_url().is_empty())
+  if (!extension ||
+      extensions::ExtensionURL::GetOptionsURL(extension).is_empty()) {
     return;
+  }
   extensions::ExtensionSystem::Get(Profile::FromWebUI(web_ui()))->
       process_manager()->OpenOptionsPage(extension,
           chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));