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

chrome/browser/extensions/updater/extension_downloader.cc

Index: chrome/browser/extensions/updater/extension_downloader.cc
diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc
index 95f6270dadaa6d30e0bee6e3a354f53d9978f7a8..f9df92c32455ea897711acec6942ef21b29e057f 100644
--- a/chrome/browser/extensions/updater/extension_downloader.cc
+++ b/chrome/browser/extensions/updater/extension_downloader.cc
@@ -25,6 +25,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ -193,7 +194,7 @@ bool ExtensionDownloader::AddExtension(const Extension& extension,
   // Skip extensions with empty update URLs converted from user
   // scripts.
   if (extension.converted_from_user_script() &&
-      extension.update_url().is_empty()) {
+      ExtensionURL::GetUpdateURL(&extension).is_empty()) {
     return false;
   }
 
@@ -204,9 +205,12 @@ bool ExtensionDownloader::AddExtension(const Extension& extension,
   if (!extension.UpdatesFromGallery())
     update_url_data = delegate_->GetUpdateUrlData(extension.id());
 
-  return AddExtensionData(extension.id(), *extension.version(),
-                          extension.GetType(), extension.update_url(),
-                          update_url_data, request_id);
+  return AddExtensionData(extension.id(),
+                          *extension.version(),
+                          extension.GetType(),
+                          ExtensionURL::GetUpdateURL(&extension),
+                          update_url_data,
+                          request_id);
 }
 
 bool ExtensionDownloader::AddPendingExtension(const std::string& id,