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

chrome/browser/extensions/extension_process_manager.cc

Index: chrome/browser/extensions/extension_process_manager.cc
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index dc54dca25efd8a2b01bc50accc365c86d24dc423..c89b25ca427f60ecbe381c02e7ed506dcaf3035a 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -25,6 +25,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_messages.h"
 #include "chrome/common/url_constants.h"
@@ -310,7 +311,7 @@ void ExtensionProcessManager::CreateBackgroundHost(
 
 void ExtensionProcessManager::OpenOptionsPage(const Extension* extension,
                                               Browser* browser) {
-  DCHECK(!extension->options_url().is_empty());
+  DCHECK(!extensions::ExtensionURL::GetOptionsURL(extension).is_empty());
 
   // Force the options page to open in non-OTR window, because it won't be
   // able to save settings from OTR.
@@ -320,8 +321,11 @@ void ExtensionProcessManager::OpenOptionsPage(const Extension* extension,
                                                 browser->host_desktop_type());
   }
 
-  OpenURLParams params(extension->options_url(), Referrer(), SINGLETON_TAB,
-                       content::PAGE_TRANSITION_LINK, false);
+  OpenURLParams params(extensions::ExtensionURL::GetOptionsURL(extension),
+                       Referrer(),
+                       SINGLETON_TAB,
+                       content::PAGE_TRANSITION_LINK,
+                       false);
   browser->OpenURL(params);
   browser->window()->Show();
   WebContents* web_contents = chrome::GetActiveWebContents(browser);