Move the parsing of "chrome_url_overrides" out of Extension.

chrome/browser/extensions/extension_web_ui.cc

Index: chrome/browser/extensions/extension_web_ui.cc
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index e93bcbc9fac48347eec724d91034387437686fdb..43a765793ef11c89c10e7060beab61acd2805a7f 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -38,6 +38,7 @@
 
 using content::WebContents;
 using extensions::Extension;
+using extensions::URLOverrides;
 
 namespace {
 
@@ -303,8 +304,8 @@ bool ExtensionWebUI::HandleChromeURLOverrideReverse(
 
 // static
 void ExtensionWebUI::RegisterChromeURLOverrides(
-    Profile* profile, const Extension::URLOverrideMap& overrides) {
-  if (overrides.empty())
+    Profile* profile, const URLOverrides::URLOverrideMap* overrides) {
+  if (!overrides || overrides->empty())
     return;
 
   PrefService* prefs = profile->GetPrefs();
@@ -313,8 +314,8 @@ void ExtensionWebUI::RegisterChromeURLOverrides(
 
   // For each override provided by the extension, add it to the front of
   // the override list if it's not already in the list.
-  Extension::URLOverrideMap::const_iterator iter = overrides.begin();
-  for (; iter != overrides.end(); ++iter) {
+  URLOverrides::URLOverrideMap::const_iterator iter = overrides->begin();
+  for (; iter != overrides->end(); ++iter) {
     const std::string& key = iter->first;
     ListValue* page_overrides;
     if (!all_overrides->GetList(key, &page_overrides)) {
@@ -381,14 +382,14 @@ void ExtensionWebUI::UnregisterChromeURLOverride(const std::string& page,
 
 // static
 void ExtensionWebUI::UnregisterChromeURLOverrides(
-    Profile* profile, const Extension::URLOverrideMap& overrides) {
-  if (overrides.empty())
+    Profile* profile, const URLOverrides::URLOverrideMap* overrides) {
+  if (!overrides || overrides->empty())
     return;
   PrefService* prefs = profile->GetPrefs();
   DictionaryPrefUpdate update(prefs, kExtensionURLOverrides);
   DictionaryValue* all_overrides = update.Get();
-  Extension::URLOverrideMap::const_iterator iter = overrides.begin();
-  for (; iter != overrides.end(); ++iter) {
+  URLOverrides::URLOverrideMap::const_iterator iter = overrides->begin();
+  for (; iter != overrides->end(); ++iter) {
     const std::string& page = iter->first;
     ListValue* page_overrides;
     if (!all_overrides->GetList(page, &page_overrides)) {