Fix chrome_url_overides to work with packed extensions.

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 999 matching lines @@
     }
   }
 
   // Chrome URL overrides (optional)
   if (source.HasKey(keys::kChromeURLOverrides)) {
     DictionaryValue* overrides;
     if (!source.GetDictionary(keys::kChromeURLOverrides, &overrides)) {
       *error = errors::kInvalidChromeURLOverrides;
       return false;
     }
+
     // Validate that the overrides are all strings
     DictionaryValue::key_iterator iter = overrides->begin_keys();
     while (iter != overrides->end_keys()) {
+      std::string page = WideToUTF8(*iter);
       // For now, only allow the new tab page.  Others will work when we remove
       // this check, but let's keep it simple for now.
       // TODO(erikkay) enable other pages as well
-      if (WideToUTF8(*iter) != chrome::kChromeUINewTabHost) {
+      if (page != chrome::kChromeUINewTabHost) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;
       }
       std::string val;
       if (!overrides->GetString(*iter, &val)) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;
       }
       // Replace the entry with a fully qualified chrome-extension:// URL.
-      GURL url = GetResourceURL(val);
-      overrides->SetString(*iter, url.spec());
+      chrome_url_overrides_[page] = GetResourceURL(val);
       ++iter;
     }
-    chrome_url_overrides_.reset(
-        static_cast<DictionaryValue*>(overrides->DeepCopy()));
   }
 
+  // Although |source| is passed in as a const, it's still possible to modify
+  // it.  This is dangerous since the utility process re-uses |source| after
+  // it calls InitFromValue, passing it up to the browser process which calls
+  // InitFromValue again.  As a result, we need to make sure that nobody
+  // accidentally modifies it.
+  DCHECK(source.Equals(manifest_value_.get()));
+
   return true;
 }
 
 std::set<FilePath> Extension::GetBrowserImages() {
   std::set<FilePath> image_paths;
 
   // extension icons
   for (std::map<int, std::string>::iterator iter = icons_.begin();
        iter != icons_.end(); ++iter) {
     image_paths.insert(FilePath::FromWStringHack(UTF8ToWide(iter->second)));
@@ skipping 93 matching lines @@
     UserScript::PatternList::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern) {
       if (pattern->match_subdomains() && pattern->host().empty())
         return true;
     }
   }
 
   return false;
 }