Atomic UserScript ID generation

chrome/browser/extensions/user_script_loader.cc

 // Copyright 2014 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/user_script_loader.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 110 matching lines @@
                                          const ExtensionId& extension_id) {
   ExtensionsInfo::const_iterator iter = extensions_info.find(extension_id);
   if (iter == extensions_info.end())
     return NULL;
   return file_util::LoadMessageBundleSubstitutionMap(
       iter->second.first, extension_id, iter->second.second);
 }
 
 void LoadUserScripts(UserScriptList* user_scripts,
                      const ExtensionsInfo& extensions_info,
-                     const std::set<int64>& added_script_ids,
+                     const std::set<int>& added_script_ids,
                      ContentVerifier* verifier) {
   for (UserScriptList::iterator script = user_scripts->begin();
        script != user_scripts->end();
        ++script) {
     if (added_script_ids.count(script->id()) == 0)
       continue;
     scoped_ptr<SubstitutionMap> localization_messages(
         GetLocalizationMessages(extensions_info, script->extension_id()));
     for (size_t k = 0; k < script->js_scripts().size(); ++k) {
       UserScript::File& script_file = script->js_scripts()[k];
@@ skipping 53 matching lines @@
   if (!shared_memory.ShareReadOnlyToProcess(base::GetCurrentProcessHandle(),
                                             &readonly_handle))
     return scoped_ptr<base::SharedMemory>();
 
   return make_scoped_ptr(new base::SharedMemory(readonly_handle,
                                                 /*read_only=*/true));
 }
 
 void LoadScriptsOnFileThread(scoped_ptr<UserScriptList> user_scripts,
                              const ExtensionsInfo& extensions_info,
-                             const std::set<int64>& added_script_ids,
+                             const std::set<int>& added_script_ids,
                              scoped_refptr<ContentVerifier> verifier,
                              LoadScriptsCallback callback) {
   DCHECK(user_scripts.get());
   LoadUserScripts(
       user_scripts.get(), extensions_info, added_script_ids, verifier);
   scoped_ptr<base::SharedMemory> memory = Serialize(*user_scripts);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(callback, base::Passed(&user_scripts), base::Passed(&memory)));
@@ skipping 110 matching lines @@
   // Greasemonkey does.
   if (script->globs().empty() && script->url_patterns().is_empty())
     script->add_glob("*");
 
   return true;
 }
 
 // static
 void UserScriptLoader::LoadScriptsForTest(UserScriptList* user_scripts) {
   ExtensionsInfo info;
-  std::set<int64> added_script_ids;
+  std::set<int> added_script_ids;
   for (UserScriptList::iterator it = user_scripts->begin();
        it != user_scripts->end();
        ++it) {
     added_script_ids.insert(it->id());
   }
   LoadUserScripts(
       user_scripts, info, added_script_ids, NULL /* no verifier for testing */);
 }
 
 UserScriptLoader::UserScriptLoader(Profile* profile,
@@ skipping 114 matching lines @@
       if (removed_scripts_.count(*it))
         it = user_scripts_->erase(it);
       else
         ++it;
     }
   }
 
   user_scripts_->insert(
       user_scripts_->end(), added_scripts_.begin(), added_scripts_.end());
 
-  std::set<int64> added_script_ids;
+  std::set<int> added_script_ids;
   for (std::set<UserScript>::const_iterator it = added_scripts_.begin();
        it != added_scripts_.end();
        ++it) {
     added_script_ids.insert(it->id());
   }
 
   // Expand |changed_extensions_| for OnScriptsLoaded, which will use it in
   // its IPC message. This must be done before we clear |added_scripts_| and
   // |removed_scripts_| below.
   std::set<UserScript> changed_scripts(added_scripts_);
@@ skipping 113 matching lines @@
       // which leads to the above lookup failing. In this case, just continue.
       if (!extension)
         continue;
       extensions_info_[*it] = ExtensionSet::ExtensionPathAndDefaultLocale(
           extension->path(), LocaleInfo::GetDefaultLocale(extension));
     }
   }
 }
 
 }  // namespace extensions