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

chrome/browser/extensions/api/management/management_api.cc

Index: chrome/browser/extensions/api/management/management_api.cc
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index 16584f1161ac84ac275d7525c640f4932f004a4b..70f2e32d209fd4519894050a5f543aa8bb7c410e 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_utility_messages.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/api/management.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -96,9 +97,10 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
   info->offline_enabled = extension.offline_enabled();
   info->version = extension.VersionString();
   info->description = extension.description();
-  info->options_url = extension.options_url().spec();
+  info->options_url =
+      extensions::ExtensionURL::GetOptionsURL(&extension).spec();
   info->homepage_url.reset(new std::string(
-      extension.GetHomepageURL().spec()));
+      extensions::ExtensionURL::GetHomepageURL(&extension).spec()));
   info->may_disable = system->management_policy()->
       UserMayModifySettings(&extension, NULL);
   info->is_app = extension.is_app();
@@ -128,9 +130,9 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
     }
   }
 
-  if (!extension.update_url().is_empty()) {
+  if (!extensions::ExtensionURL::GetUpdateURL(&extension).is_empty()) {
     info->update_url.reset(new std::string(
-        extension.update_url().spec()));
+        extensions::ExtensionURL::GetUpdateURL(&extension).spec()));
   }
 
   if (extension.is_app()) {