Create thread-safe RendererExtensionRegistry from ExtensionSet

extensions/common/extension_set.cc

 // Copyright 2013 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 "extensions/common/extension_set.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "extensions/common/constants.h"
@@ skipping 26 matching lines @@
 
 bool ExtensionSet::is_empty() const {
   return extensions_.empty();
 }
 
 bool ExtensionSet::Contains(const std::string& extension_id) const {
   return extensions_.find(extension_id) != extensions_.end();
 }
 
 bool ExtensionSet::Insert(const scoped_refptr<const Extension>& extension) {
+  base::AutoLock auto_lock(runtime_lock_);

[not at google - send to devlin, 2015/08/13 23:33:55]

I think we'll need the lock over every method, not just the mutation ones. E.g.
I don't know how C++ will behave in Contains if the set changes between the
find() and the end() call.

   bool was_present = ContainsKey(extensions_, extension->id());
   extensions_[extension->id()] = extension;
   if (!was_present && !modification_callback_.is_null())
     modification_callback_.Run(GetIDs());
   return !was_present;
 }
 
 bool ExtensionSet::InsertAll(const ExtensionSet& extensions) {
   size_t before = size();
   for (ExtensionSet::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     Insert(*iter);
   }
   return size() != before;
 }
 
 bool ExtensionSet::Remove(const std::string& id) {
+  base::AutoLock auto_lock(runtime_lock_);
   bool was_present = extensions_.erase(id) > 0;
   if (was_present && !modification_callback_.is_null())
     modification_callback_.Run(GetIDs());
   return was_present;
 }
 
 void ExtensionSet::Clear() {
+  base::AutoLock auto_lock(runtime_lock_);
   extensions_.clear();
 }
 
 std::string ExtensionSet::GetExtensionOrAppIDByURL(const GURL& url) const {
   if (url.SchemeIs(kExtensionScheme))
     return url.host();
 
   const Extension* extension = GetHostedAppByURL(url);
   if (!extension)
     return std::string();
 
   return extension->id();
 }
 
 const Extension* ExtensionSet::GetExtensionOrAppByURL(const GURL& url) const {
   if (url.SchemeIs(kExtensionScheme))
     return GetByID(url.host());
 
   return GetHostedAppByURL(url);
 }
 
 const Extension* ExtensionSet::GetAppByURL(const GURL& url) const {
   const Extension* extension = GetExtensionOrAppByURL(url);
   return (extension && extension->is_app()) ? extension : NULL;
 }
 
 const Extension* ExtensionSet::GetHostedAppByURL(const GURL& url) const {
+  base::AutoLock auto_lock(runtime_lock_);
   for (ExtensionMap::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if (iter->second->web_extent().MatchesURL(url))
       return iter->second.get();
   }
 
   return NULL;
 }
 
 const Extension* ExtensionSet::GetHostedAppByOverlappingWebExtent(
     const URLPatternSet& extent) const {
+  base::AutoLock auto_lock(runtime_lock_);
   for (ExtensionMap::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if (iter->second->web_extent().OverlapsWith(extent))
       return iter->second.get();
   }
 
   return NULL;
 }
 
 bool ExtensionSet::InSameExtent(const GURL& old_url,
                                 const GURL& new_url) const {
   return GetExtensionOrAppByURL(old_url) ==
       GetExtensionOrAppByURL(new_url);
 }
 
 const Extension* ExtensionSet::GetByID(const std::string& id) const {
+  base::AutoLock auto_lock(runtime_lock_);
   ExtensionMap::const_iterator i = extensions_.find(id);
   if (i != extensions_.end())
     return i->second.get();
   else
     return NULL;
 }
 
 ExtensionIdSet ExtensionSet::GetIDs() const {
+  base::AutoLock auto_lock(runtime_lock_);
   ExtensionIdSet ids;
   for (ExtensionMap::const_iterator it = extensions_.begin();
        it != extensions_.end(); ++it) {
     ids.insert(it->first);
   }
   return ids;
 }
 
 bool ExtensionSet::ExtensionBindingsAllowed(const GURL& url) const {
+  base::AutoLock auto_lock(runtime_lock_);
   if (url.SchemeIs(kExtensionScheme))
     return true;
 
   for (ExtensionMap::const_iterator it = extensions_.begin();
        it != extensions_.end(); ++it) {
     if (it->second->location() == Manifest::COMPONENT &&
         it->second->web_extent().MatchesURL(url))
       return true;
   }
 
   return false;
 }
 
 }  // namespace extensions