[CleanUp] Use base::STLSetDifference in place of std::set_difference

BUG=254066
TEST=compiled

Review URL: https://chromiumcodereview.appspot.com/22460011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219264 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 53 insertions, 101 deletions

diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc
index 93fdb73..0316883 100644
--- a/chrome/browser/download/download_history_unittest.cc
+++ b/chrome/browser/download/download_history_unittest.cc
@@ -171,13 +171,7 @@ class FakeHistoryAdapter : public DownloadHistory::HistoryAdapter {
   void ExpectDownloadsRemoved(const IdSet& ids) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
-    IdSet differences;
-    std::insert_iterator<IdSet> differences_iter(
-        differences, differences.begin());
-    std::set_difference(ids.begin(), ids.end(),
-                        remove_downloads_.begin(),
-                        remove_downloads_.end(),
-                        differences_iter);
+    IdSet differences = base::STLSetDifference<IdSet>(ids, remove_downloads_);
     for (IdSet::const_iterator different = differences.begin();
          different != differences.end(); ++different) {
       EXPECT_TRUE(false) << *different;
diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc
index e0f6dbb5..902bbcd 100644
--- a/chrome/browser/extensions/blacklist.cc
+++ b/chrome/browser/extensions/blacklist.cc
@@ -10,6 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
+#include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_prefs.h"
@@ -217,16 +218,12 @@ void Blacklist::SetFromUpdater(const std::vector<std::string>& ids,
 
   std::set<std::string> from_prefs = prefs_->GetBlacklistedExtensions();
 
-  std::set<std::string> no_longer_blacklisted;
-  std::set_difference(from_prefs.begin(), from_prefs.end(),
-                      ids_as_set.begin(), ids_as_set.end(),
-                      std::inserter(no_longer_blacklisted,
-                                    no_longer_blacklisted.begin()));
-  std::set<std::string> not_yet_blacklisted;
-  std::set_difference(ids_as_set.begin(), ids_as_set.end(),
-                      from_prefs.begin(), from_prefs.end(),
-                      std::inserter(not_yet_blacklisted,
-                                    not_yet_blacklisted.begin()));
+  std::set<std::string> no_longer_blacklisted =
+      base::STLSetDifference<std::set<std::string> >(from_prefs,
+                                                     ids_as_set);
+  std::set<std::string> not_yet_blacklisted =
+      base::STLSetDifference<std::set<std::string> >(ids_as_set,
+                                                     from_prefs);
 
   for (std::set<std::string>::iterator it = no_longer_blacklisted.begin();
        it != no_longer_blacklisted.end(); ++it) {
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 8c99140..2d0a040 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -3124,16 +3124,12 @@ void ExtensionService::ManageBlacklist(
     const std::set<std::string>& new_blacklisted_ids) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  std::set<std::string> no_longer_blacklisted;
-  std::set_difference(old_blacklisted_ids.begin(), old_blacklisted_ids.end(),
-                      new_blacklisted_ids.begin(), new_blacklisted_ids.end(),
-                      std::inserter(no_longer_blacklisted,
-                                    no_longer_blacklisted.begin()));
-  std::set<std::string> not_yet_blacklisted;
-  std::set_difference(new_blacklisted_ids.begin(), new_blacklisted_ids.end(),
-                      old_blacklisted_ids.begin(), old_blacklisted_ids.end(),
-                      std::inserter(not_yet_blacklisted,
-                                    not_yet_blacklisted.begin()));
+  std::set<std::string> no_longer_blacklisted =
+      base::STLSetDifference<std::set<std::string> >(old_blacklisted_ids,
+                                                     new_blacklisted_ids);
+  std::set<std::string> not_yet_blacklisted =
+      base::STLSetDifference<std::set<std::string> >(new_blacklisted_ids,
+                                                     old_blacklisted_ids);
 
   for (std::set<std::string>::iterator it = no_longer_blacklisted.begin();
        it != no_longer_blacklisted.end(); ++it) {
diff --git a/chrome/browser/history/url_index_private_data.cc b/chrome/browser/history/url_index_private_data.cc
index d4548cb..0d94e14 100644
--- a/chrome/browser/history/url_index_private_data.cc
+++ b/chrome/browser/history/url_index_private_data.cc
@@ -595,10 +595,8 @@ HistoryIDSet URLIndexPrivateData::HistoryIDsForTerm(
 
     // Filter for each remaining, unique character in the term.
     Char16Set leftover_chars = Char16SetFromString16(leftovers);
-    Char16Set unique_chars;
-    std::set_difference(leftover_chars.begin(), leftover_chars.end(),
-                        prefix_chars.begin(), prefix_chars.end(),
-                        std::inserter(unique_chars, unique_chars.begin()));
+    Char16Set unique_chars =
+        base::STLSetDifference<Char16Set>(leftover_chars, prefix_chars);
 
     // Reduce the word set with any leftover, unprocessed characters.
     if (!unique_chars.empty()) {
diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc
index 938249d..9f57566 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -267,11 +267,9 @@ class ExtensionGalleriesHost
          ++it) {
       old_galleries.insert(it->first);
     }
-    MediaGalleryPrefIdSet invalid_galleries;
-    std::set_difference(old_galleries.begin(), old_galleries.end(),
-                        new_galleries.begin(), new_galleries.end(),
-                        std::inserter(invalid_galleries,
-                                      invalid_galleries.begin()));
+    MediaGalleryPrefIdSet invalid_galleries =
+        base::STLSetDifference<MediaGalleryPrefIdSet>(old_galleries,
+                                                      new_galleries);
     for (MediaGalleryPrefIdSet::const_iterator it = invalid_galleries.begin();
          it != invalid_galleries.end();
          ++it) {
diff --git a/chrome/browser/spellchecker/feedback.cc b/chrome/browser/spellchecker/feedback.cc
index 42bebbc..b571a53 100644
--- a/chrome/browser/spellchecker/feedback.cc
+++ b/chrome/browser/spellchecker/feedback.cc
@@ -19,6 +19,8 @@
 #include <algorithm>
 #include <iterator>
 
+#include "base/stl_util.h"
+
 namespace spellcheck {
 
 Feedback::Feedback() {
@@ -44,12 +46,9 @@ void Feedback::FinalizeRemovedMisspellings(
   HashCollection& renderer_hashes = renderer_it->second;
   HashCollection remaining_hashes(remaining_markers.begin(),
                                   remaining_markers.end());
-  std::vector<uint32> removed_hashes;
-  std::set_difference(renderer_hashes.begin(),
-                      renderer_hashes.end(),
-                      remaining_hashes.begin(),
-                      remaining_hashes.end(),
-                      std::back_inserter(removed_hashes));
+  std::vector<uint32> removed_hashes =
+      base::STLSetDifference<std::vector<uint32> >(renderer_hashes,
+                                                   remaining_hashes);
   for (std::vector<uint32>::const_iterator hash_it = removed_hashes.begin();
        hash_it != removed_hashes.end();
        ++hash_it) {
diff --git a/chrome/browser/spellchecker/feedback_sender.cc b/chrome/browser/spellchecker/feedback_sender.cc
index f8d4957..8943667 100644
--- a/chrome/browser/spellchecker/feedback_sender.cc
+++ b/chrome/browser/spellchecker/feedback_sender.cc
@@ -345,12 +345,9 @@ void FeedbackSender::RequestDocumentMarkers() {
   // longer alive.
   std::vector<int> known_renderers = feedback_.GetRendersWithMisspellings();
   std::sort(known_renderers.begin(), known_renderers.end());
-  std::vector<int> dead_renderers;
-  std::set_difference(known_renderers.begin(),
-                      known_renderers.end(),
-                      alive_renderers.begin(),
-                      alive_renderers.end(),
-                      std::back_inserter(dead_renderers));
+  std::vector<int> dead_renderers =
+      base::STLSetDifference<std::vector<int> >(known_renderers,
+                                                alive_renderers);
   for (std::vector<int>::const_iterator it = dead_renderers.begin();
        it != dead_renderers.end();
        ++it) {
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
index c5c8163..4872b4e 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
@@ -129,12 +129,7 @@ void SaveDictionaryFileReliably(
 int SanitizeWordsToAdd(const WordSet& existing, WordList& to_add) {
   // Do not add duplicate words.
   std::sort(to_add.begin(), to_add.end());
-  WordList new_words;
-  std::set_difference(to_add.begin(),
-                      to_add.end(),
-                      existing.begin(),
-                      existing.end(),
-                      std::back_inserter(new_words));
+  WordList new_words = base::STLSetDifference<WordList>(to_add, existing);
   new_words.erase(std::unique(new_words.begin(), new_words.end()),
                   new_words.end());
   int result = VALID_CHANGE;
@@ -328,12 +323,8 @@ syncer::SyncMergeResult SpellcheckCustomDictionary::MergeDataAndStartSyncing(
 
   // Add as many as possible local words remotely.
   std::sort(to_add_locally.begin(), to_add_locally.end());
-  WordList to_add_remotely;
-  std::set_difference(words_.begin(),
-                      words_.end(),
-                      to_add_locally.begin(),
-                      to_add_locally.end(),
-                      std::back_inserter(to_add_remotely));
+  WordList to_add_remotely = base::STLSetDifference<WordList>(words_,
+                                                              to_add_locally);
 
   // Send local changes to the sync server.
   Change to_change_remotely(to_add_remotely);
@@ -431,12 +422,9 @@ void SpellcheckCustomDictionary::UpdateDictionaryFile(
 
   // Remove words.
   std::sort(custom_words.begin(), custom_words.end());
-  WordList remaining;
-  std::set_difference(custom_words.begin(),
-                      custom_words.end(),
-                      dictionary_change.to_remove().begin(),
-                      dictionary_change.to_remove().end(),
-                      std::back_inserter(remaining));
+  WordList remaining =
+      base::STLSetDifference<WordList>(custom_words,
+                                       dictionary_change.to_remove());
   std::swap(custom_words, remaining);
 
   SaveDictionaryFileReliably(custom_words, path);
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 10bd53c..a099c47 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -1092,14 +1092,10 @@ void TabStripGtk::TabSelectionChanged(TabStripModel* tab_strip_model,
       GetTabAtAdjustForAnimation(*it)->SchedulePaint();
   }
 
-  ui::ListSelectionModel::SelectedIndices no_longer_selected;
-  std::insert_iterator<std::vector<int> > it2(no_longer_selected,
-                                              no_longer_selected.begin());
-  std::set_difference(old_model.selected_indices().begin(),
-                      old_model.selected_indices().end(),
-                      model_->selection_model().selected_indices().begin(),
-                      model_->selection_model().selected_indices().end(),
-                      it2);
+  ui::ListSelectionModel::SelectedIndices no_longer_selected =
+      base::STLSetDifference<ui::ListSelectionModel::SelectedIndices>(
+          old_model.selected_indices(),
+          model_->selection_model().selected_indices());
   for (std::vector<int>::iterator it = no_longer_selected.begin();
        it != no_longer_selected.end(); ++it) {
     GetTabAtAdjustForAnimation(*it)->StopMiniTabTitleAnimation();
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index a99257d..321fe2c 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -843,14 +843,10 @@ void TabStrip::SetSelection(const ui::ListSelectionModel& old_selection,
     }
   }
 
-  ui::ListSelectionModel::SelectedIndices no_longer_selected;
-  std::insert_iterator<ui::ListSelectionModel::SelectedIndices>
-      it(no_longer_selected, no_longer_selected.begin());
-  std::set_difference(old_selection.selected_indices().begin(),
-                      old_selection.selected_indices().end(),
-                      new_selection.selected_indices().begin(),
-                      new_selection.selected_indices().end(),
-                      it);
+  ui::ListSelectionModel::SelectedIndices no_longer_selected =
+      base::STLSetDifference<ui::ListSelectionModel::SelectedIndices>(
+          old_selection.selected_indices(),
+          new_selection.selected_indices());
   for (size_t i = 0; i < no_longer_selected.size(); ++i)
     tab_at(no_longer_selected[i])->StopMiniTabTitleAnimation();
 }
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index ba68a9f..446c808 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -559,11 +559,9 @@ bool PermissionSet::HasLessHostPrivilegesThan(
   // considered an elevation, even though it is not (http://crbug.com/65337).
   std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false));
   std::set<std::string> old_hosts_set(GetDistinctHosts(old_list, false, false));
-  std::set<std::string> new_hosts_only;
-
-  std::set_difference(new_hosts_set.begin(), new_hosts_set.end(),
-                      old_hosts_set.begin(), old_hosts_set.end(),
-                      std::inserter(new_hosts_only, new_hosts_only.begin()));
+  std::set<std::string> new_hosts_only =
+      base::STLSetDifference<std::set<std::string> >(new_hosts_set,
+                                                     old_hosts_set);
 
   return !new_hosts_only.empty();
 }
diff --git a/extensions/common/matcher/url_matcher.cc b/extensions/common/matcher/url_matcher.cc
index be3057a..5a1d876 100644
--- a/extensions/common/matcher/url_matcher.cc
+++ b/extensions/common/matcher/url_matcher.cc
@@ -752,19 +752,15 @@ void URLMatcher::UpdateSubstringSetMatcher(bool full_url_conditions) {
                           : registered_url_component_patterns_;
 
   // Add all patterns that are in new_patterns but not in registered_patterns.
-  std::vector<const StringPattern*> patterns_to_register;
-  std::set_difference(
-      new_patterns.begin(), new_patterns.end(),
-      registered_patterns.begin(), registered_patterns.end(),
-      std::back_inserter(patterns_to_register));
+  std::vector<const StringPattern*> patterns_to_register =
+      base::STLSetDifference<std::vector<const StringPattern*> >(
+          new_patterns, registered_patterns);
 
   // Remove all patterns that are in registered_patterns but not in
   // new_patterns.
-  std::vector<const StringPattern*> patterns_to_unregister;
-  std::set_difference(
-      registered_patterns.begin(), registered_patterns.end(),
-      new_patterns.begin(), new_patterns.end(),
-      std::back_inserter(patterns_to_unregister));
+  std::vector<const StringPattern*> patterns_to_unregister =
+      base::STLSetDifference<std::vector<const StringPattern*> >(
+           registered_patterns, new_patterns);
 
   // Update the SubstringSetMatcher.
   SubstringSetMatcher& url_matcher =
diff --git a/ui/base/test/ui_cocoa_test_helper.mm b/ui/base/test/ui_cocoa_test_helper.mm
index 478aa31..a33228f 100644
--- a/ui/base/test/ui_cocoa_test_helper.mm
+++ b/ui/base/test/ui_cocoa_test_helper.mm
@@ -6,6 +6,7 @@
 
 #include "base/debug/debugger.h"
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
 
 @implementation CocoaTestHelperWindow
@@ -179,10 +180,8 @@ std::set<NSWindow*> CocoaTest::ApplicationWindows() {
 
 std::set<NSWindow*> CocoaTest::WindowsLeft() {
   const std::set<NSWindow*> windows(ApplicationWindows());
-  std::set<NSWindow*> windows_left;
-  std::set_difference(windows.begin(), windows.end(),
-                      initial_windows_.begin(), initial_windows_.end(),
-                      std::inserter(windows_left, windows_left.begin()));
+  std::set<NSWindow*> windows_left =
+      base::STLSetDifference<std::set<NSWindow*> >(windows, initial_windows_);
   return windows_left;
 }