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

chrome/browser/devtools/devtools_window.cc

Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 8c9fbe1dc719d1ce6b91dac0c92b4945af8fd7ef..7ceb159eda46fd4ab10dbdeeebdcb5ca6b6e0a0f 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.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/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ -484,11 +485,13 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() {
 
   for (ExtensionSet::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
-    if ((*extension)->devtools_url().is_empty())
+    if (extensions::ExtensionURL::GetDevToolsURL(*extension).is_empty())
       continue;
     DictionaryValue* extension_info = new DictionaryValue();
-    extension_info->Set("startPage",
-        new StringValue((*extension)->devtools_url().spec()));
+    extension_info->Set(
+        "startPage",
+        new StringValue(
+            extensions::ExtensionURL::GetDevToolsURL(*extension).spec()));
     extension_info->Set("name", new StringValue((*extension)->name()));
     bool allow_experimental = (*extension)->HasAPIPermission(
         extensions::APIPermission::kExperimental);