Fix chrome_url_overides to work with packed extensions.

chrome/browser/extensions/extension_dom_ui.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_dom_ui.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/profile.h"
@@ skipping 120 matching lines @@
     }
 
     *url = extension_url;
     return true;
   }
   return false;
 }
 
 // static
 void ExtensionDOMUI::RegisterChromeURLOverrides(
-    Profile* profile, const DictionaryValue* new_overrides) {
-  if (!new_overrides)
+    Profile* profile, const Extension::URLOverrideMap& overrides) {
+  if (overrides.empty())
     return;
 
   PrefService* prefs = profile->GetPrefs();
   DictionaryValue* all_overrides =
       prefs->GetMutableDictionary(kExtensionURLOverrides);
 
   // For each override provided by the extension, add it to the front of
   // the override list if it's not already in the list.
-  DictionaryValue::key_iterator iter = new_overrides->begin_keys();
-  for (;iter != new_overrides->end_keys(); ++iter) {
-    Value* val;
-    new_overrides->Get(*iter, &val);
-    std::string string_val;
-    if (!val->GetAsString(&string_val)) {
-      NOTREACHED();
-      continue;
-    }
+  Extension::URLOverrideMap::const_iterator iter = overrides.begin();
+  for (;iter != overrides.end(); ++iter) {
+    const std::wstring key = UTF8ToWide((*iter).first);
     ListValue* page_overrides;
-    if (!all_overrides->GetList(*iter, &page_overrides)) {
+    if (!all_overrides->GetList(key, &page_overrides)) {
       page_overrides = new ListValue();
-      all_overrides->Set(*iter, page_overrides);
+      all_overrides->Set(key, page_overrides);
     } else {
       // Verify that the override isn't already in the list.
       ListValue::iterator i = page_overrides->begin();
       for (; i != page_overrides->end(); ++i) {
         std::string override_val;
         if (!(*i)->GetAsString(&override_val)) {
           NOTREACHED();
           continue;
         }
-        if (override_val == string_val)
+        if (override_val == (*iter).first)
           break;
       }
       // This value is already in the list, leave it alone.
       if (i != page_overrides->end())
         continue;
     }
     // Insert the override at the front of the list.  Last registered override
     // wins.
-    page_overrides->Insert(0, val->DeepCopy());
+    page_overrides->Insert(0, new StringValue((*iter).second.spec()));
   }
 }
 
 // static
 void ExtensionDOMUI::UnregisterAndReplaceOverride(const std::string& page,
     Profile* profile, ListValue* list, Value* override) {
   int index = list->Remove(*override);
   if (index == 0) {
     // This is the active override, so we need to find all existing
     // tabs for this override and get them to reload the original URL.
@@ skipping 26 matching lines @@
     // If it's being unregistered, it should already be in the list.
     NOTREACHED();
     return;
   } else {
     UnregisterAndReplaceOverride(page, profile, page_overrides, override);
   }
 }
 
 // static
 void ExtensionDOMUI::UnregisterChromeURLOverrides(
-    Profile* profile, const DictionaryValue* new_overrides) {
-  if (!new_overrides)
+    Profile* profile, const Extension::URLOverrideMap& overrides) {
+  if (overrides.empty())
     return;
   PrefService* prefs = profile->GetPrefs();
   DictionaryValue* all_overrides =
       prefs->GetMutableDictionary(kExtensionURLOverrides);
-  DictionaryValue::key_iterator iter = new_overrides->begin_keys();
-  for (; iter != new_overrides->end_keys(); ++iter) {
-    Value* val;
-    if (!new_overrides->Get(*iter, &val)) {
-      NOTREACHED();
-      return;
-    }
+  Extension::URLOverrideMap::const_iterator iter = overrides.begin();
+  for (;iter != overrides.end(); ++iter) {
+    std::wstring page = UTF8ToWide((*iter).first);
     ListValue* page_overrides;
-    if (!all_overrides->GetList(*iter, &page_overrides)) {
+    if (!all_overrides->GetList(page, &page_overrides)) {
       // If it's being unregistered, it should already be in the list.
       NOTREACHED();
       continue;
     } else {
-      UnregisterAndReplaceOverride(WideToUTF8(*iter), profile, page_overrides,
-                                   val);
+      StringValue override((*iter).second.spec());
+      UnregisterAndReplaceOverride((*iter).first, profile,
+                                   page_overrides, &override);
     }
   }
 }