Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)...

chrome/browser/safe_browsing/safe_browsing_store.cc

 // Copyright (c) 2010 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/safe_browsing/safe_browsing_store.h"
 
 #include <algorithm>
 
-#include "base/task.h"
-
 namespace {
 
 // Find items matching between |subs| and |adds|, and remove them,
 // recording the item from |adds| in |adds_removed|.  To minimize
 // copies, the inputs are processing in parallel, so |subs| and |adds|
 // should be compatibly ordered (either by SBAddPrefixLess or
 // SBAddPrefixHashLess).
 //
 // |predAS| provides add < sub, |predSA| provides sub < add, for the
 // tightest compare appropriate (see calls in SBProcessSubs).
@@ skipping 108 matching lines @@
                    std::vector<SBSubFullHash>* sub_full_hashes,
                    const base::hash_set<int32>& add_chunks_deleted,
                    const base::hash_set<int32>& sub_chunks_deleted) {
   // It is possible to structure templates and template
   // specializations such that the following calls work without having
   // to qualify things.  It becomes very arbitrary, though, and less
   // clear how things are working.
 
   // Sort the inputs by the SBAddPrefix bits.
   std::sort(add_prefixes->begin(), add_prefixes->end(),
-            SBAddPrefixLess<SBAddPrefix, SBAddPrefix>);
+            SBAddPrefixLess<SBAddPrefix,SBAddPrefix>);
   std::sort(sub_prefixes->begin(), sub_prefixes->end(),
-            SBAddPrefixLess<SBSubPrefix, SBSubPrefix>);
+            SBAddPrefixLess<SBSubPrefix,SBSubPrefix>);
   std::sort(add_full_hashes->begin(), add_full_hashes->end(),
-            SBAddPrefixHashLess<SBAddFullHash, SBAddFullHash>);
+            SBAddPrefixHashLess<SBAddFullHash,SBAddFullHash>);
   std::sort(sub_full_hashes->begin(), sub_full_hashes->end(),
-            SBAddPrefixHashLess<SBSubFullHash, SBSubFullHash>);
+            SBAddPrefixHashLess<SBSubFullHash,SBSubFullHash>);
 
   // Factor out the prefix subs.
   std::vector<SBAddPrefix> removed_adds;
   KnockoutSubs(sub_prefixes, add_prefixes,
-               SBAddPrefixLess<SBAddPrefix, SBSubPrefix>,
-               SBAddPrefixLess<SBSubPrefix, SBAddPrefix>,
+               SBAddPrefixLess<SBAddPrefix,SBSubPrefix>,
+               SBAddPrefixLess<SBSubPrefix,SBAddPrefix>,
                &removed_adds);
 
   // Remove the full-hashes corrosponding to the adds which
   // KnockoutSubs() removed.  Processing these w/in KnockoutSubs()
   // would make the code more complicated, and they are very small
   // relative to the prefix lists so the gain would be modest.
   RemoveMatchingPrefixes(removed_adds, add_full_hashes);
   RemoveMatchingPrefixes(removed_adds, sub_full_hashes);
 
   // http://crbug.com/52385
   // TODO(shess): AFAICT this pass is not done on the trunk.  I
   // believe that's a bug, but it may not matter because full-hash
   // subs almost never happen (I think you'd need multiple collisions
   // where one of the sites stopped being flagged?).  Enable this once
   // everything is in.  [if(0) instead of #ifdef 0 to make sure it
   // compiles.]
   if (0) {
     // Factor out the full-hash subs.
     std::vector<SBAddFullHash> removed_full_adds;
     KnockoutSubs(sub_full_hashes, add_full_hashes,
-                 SBAddPrefixHashLess<SBAddFullHash, SBSubFullHash>,
-                 SBAddPrefixHashLess<SBSubFullHash, SBAddFullHash>,
+                 SBAddPrefixHashLess<SBAddFullHash,SBSubFullHash>,
+                 SBAddPrefixHashLess<SBSubFullHash,SBAddFullHash>,
                  &removed_full_adds);
   }
 
   // Remove items from the deleted chunks.  This is done after other
   // processing to allow subs to knock out adds (and be removed) even
   // if the add's chunk is deleted.
   RemoveDeleted(add_prefixes, add_chunks_deleted);
   RemoveDeleted(sub_prefixes, sub_chunks_deleted);
   RemoveDeleted(add_full_hashes, add_chunks_deleted);
   RemoveDeleted(sub_full_hashes, sub_chunks_deleted);
 }