some cleanup for base/stl_util

removed unused/irrelevant functions
removed irrelevant comments
Moved stl_util-inl.h => stl_util.h

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/7342047

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

DEPS

@@ -62,7 +62,7 @@ deps = {
     "/trunk/deps/third_party/icu46@90787",
 
   "src/third_party/hunspell":
-   "/trunk/deps/third_party/hunspell@65351",
+   "/trunk/deps/third_party/hunspell@93061",
 
   "src/third_party/hunspell_dictionaries":
     "/trunk/deps/third_party/hunspell_dictionaries@79099",

base/base.gypi

@@ -215,7 +215,7 @@
           'shared_memory_win.cc',
           'spin_wait.h',
           'stack_container.h',
-          'stl_util-inl.h',
+          'stl_util.h',
           'string_number_conversions.cc',
           'string_number_conversions.h',
           'string_piece.cc',

base/files/file_path_watcher_browsertest.cc

@@ -21,7 +21,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"

base/memory/scoped_vector.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 // ScopedVector wraps a vector deleting the elements from its
 // destructor.

base/stl_util-inl.h

@@ -1,452 +0,0 @@
-// 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.
-
-// STL utility functions.  Usually, these replace built-in, but slow(!),
-// STL functions with more efficient versions.
-
-#ifndef BASE_STL_UTIL_INL_H_
-#define BASE_STL_UTIL_INL_H_
-#pragma once
-
-#include <string.h>  // for memcpy
-#include <functional>
-#include <set>
-#include <string>
-#include <vector>
-#include <cassert>
-
-// Clear internal memory of an STL object.
-// STL clear()/reserve(0) does not always free internal memory allocated
-// This function uses swap/destructor to ensure the internal memory is freed.
-template<class T> void STLClearObject(T* obj) {
-  T tmp;
-  tmp.swap(*obj);
-  obj->reserve(0);  // this is because sometimes "T tmp" allocates objects with
-                    // memory (arena implementation?).  use reserve()
-                    // to clear() even if it doesn't always work
-}
-
-// Reduce memory usage on behalf of object if it is using more than
-// "bytes" bytes of space.  By default, we clear objects over 1MB.
-template <class T> inline void STLClearIfBig(T* obj, size_t limit = 1<<20) {
-  if (obj->capacity() >= limit) {
-    STLClearObject(obj);
-  } else {
-    obj->clear();
-  }
-}
-
-// Reserve space for STL object.
-// STL's reserve() will always copy.
-// This function avoid the copy if we already have capacity
-template<class T> void STLReserveIfNeeded(T* obj, int new_size) {
-  if (obj->capacity() < new_size)   // increase capacity
-    obj->reserve(new_size);
-  else if (obj->size() > new_size)  // reduce size
-    obj->resize(new_size);
-}
-
-// STLDeleteContainerPointers()
-//  For a range within a container of pointers, calls delete
-//  (non-array version) on these pointers.
-// NOTE: for these three functions, we could just implement a DeleteObject
-// functor and then call for_each() on the range and functor, but this
-// requires us to pull in all of algorithm.h, which seems expensive.
-// For hash_[multi]set, it is important that this deletes behind the iterator
-// because the hash_set may call the hash function on the iterator when it is
-// advanced, which could result in the hash function trying to deference a
-// stale pointer.
-template <class ForwardIterator>
-void STLDeleteContainerPointers(ForwardIterator begin, ForwardIterator end) {
-  while (begin != end) {
-    ForwardIterator temp = begin;
-    ++begin;
-    delete *temp;
-  }
-}
-
-// STLDeleteContainerPairPointers()
-//  For a range within a container of pairs, calls delete
-//  (non-array version) on BOTH items in the pairs.
-// NOTE: Like STLDeleteContainerPointers, it is important that this deletes
-// behind the iterator because if both the key and value are deleted, the
-// container may call the hash function on the iterator when it is advanced,
-// which could result in the hash function trying to dereference a stale
-// pointer.
-template <class ForwardIterator>
-void STLDeleteContainerPairPointers(ForwardIterator begin,
-                                    ForwardIterator end) {
-  while (begin != end) {
-    ForwardIterator temp = begin;
-    ++begin;
-    delete temp->first;
-    delete temp->second;
-  }
-}
-
-// STLDeleteContainerPairFirstPointers()
-//  For a range within a container of pairs, calls delete (non-array version)
-//  on the FIRST item in the pairs.
-// NOTE: Like STLDeleteContainerPointers, deleting behind the iterator.
-template <class ForwardIterator>
-void STLDeleteContainerPairFirstPointers(ForwardIterator begin,
-                                         ForwardIterator end) {
-  while (begin != end) {
-    ForwardIterator temp = begin;
-    ++begin;
-    delete temp->first;
-  }
-}
-
-// STLDeleteContainerPairSecondPointers()
-//  For a range within a container of pairs, calls delete
-//  (non-array version) on the SECOND item in the pairs.
-template <class ForwardIterator>
-void STLDeleteContainerPairSecondPointers(ForwardIterator begin,
-                                          ForwardIterator end) {
-  while (begin != end) {
-    delete begin->second;
-    ++begin;
-  }
-}
-
-template<typename T>
-inline void STLAssignToVector(std::vector<T>* vec,
-                              const T* ptr,
-                              size_t n) {
-  vec->resize(n);
-  memcpy(&vec->front(), ptr, n*sizeof(T));
-}
-
-/***** Hack to allow faster assignment to a vector *****/
-
-// This routine speeds up an assignment of 32 bytes to a vector from
-// about 250 cycles per assignment to about 140 cycles.
-//
-// Usage:
-//      STLAssignToVectorChar(&vec, ptr, size);
-//      STLAssignToString(&str, ptr, size);
-
-inline void STLAssignToVectorChar(std::vector<char>* vec,
-                                  const char* ptr,
-                                  size_t n) {
-  STLAssignToVector(vec, ptr, n);
-}
-
-inline void STLAssignToString(std::string* str, const char* ptr, size_t n) {
-  str->resize(n);
-  memcpy(&*str->begin(), ptr, n);
-}
-
-// To treat a possibly-empty vector as an array, use these functions.
-// If you know the array will never be empty, you can use &*v.begin()
-// directly, but that is allowed to dump core if v is empty.  This
-// function is the most efficient code that will work, taking into
-// account how our STL is actually implemented.  THIS IS NON-PORTABLE
-// CODE, so call us instead of repeating the nonportable code
-// everywhere.  If our STL implementation changes, we will need to
-// change this as well.
-
-template<typename T>
-inline T* vector_as_array(std::vector<T>* v) {
-# ifdef NDEBUG
-  return &*v->begin();
-# else
-  return v->empty() ? NULL : &*v->begin();
-# endif
-}
-
-template<typename T>
-inline const T* vector_as_array(const std::vector<T>* v) {
-# ifdef NDEBUG
-  return &*v->begin();
-# else
-  return v->empty() ? NULL : &*v->begin();
-# endif
-}
-
-// Return a mutable char* pointing to a string's internal buffer,
-// which may not be null-terminated. Writing through this pointer will
-// modify the string.
-//
-// string_as_array(&str)[i] is valid for 0 <= i < str.size() until the
-// next call to a string method that invalidates iterators.
-//
-// As of 2006-04, there is no standard-blessed way of getting a
-// mutable reference to a string's internal buffer. However, issue 530
-// (http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#530)
-// proposes this as the method. According to Matt Austern, this should
-// already work on all current implementations.
-inline char* string_as_array(std::string* str) {
-  // DO NOT USE const_cast<char*>(str->data())! See the unittest for why.
-  return str->empty() ? NULL : &*str->begin();
-}
-
-// These are methods that test two hash maps/sets for equality.  These exist
-// because the == operator in the STL can return false when the maps/sets
-// contain identical elements.  This is because it compares the internal hash
-// tables which may be different if the order of insertions and deletions
-// differed.
-
-template <class HashSet>
-inline bool HashSetEquality(const HashSet& set_a, const HashSet& set_b) {
-  if (set_a.size() != set_b.size()) return false;
-  for (typename HashSet::const_iterator i = set_a.begin();
-       i != set_a.end(); ++i) {
-    if (set_b.find(*i) == set_b.end())
-      return false;
-  }
-  return true;
-}
-
-template <class HashMap>
-inline bool HashMapEquality(const HashMap& map_a, const HashMap& map_b) {
-  if (map_a.size() != map_b.size()) return false;
-  for (typename HashMap::const_iterator i = map_a.begin();
-       i != map_a.end(); ++i) {
-    typename HashMap::const_iterator j = map_b.find(i->first);
-    if (j == map_b.end()) return false;
-    if (i->second != j->second) return false;
-  }
-  return true;
-}
-
-// The following functions are useful for cleaning up STL containers
-// whose elements point to allocated memory.
-
-// STLDeleteElements() deletes all the elements in an STL container and clears
-// the container.  This function is suitable for use with a vector, set,
-// hash_set, or any other STL container which defines sensible begin(), end(),
-// and clear() methods.
-//
-// If container is NULL, this function is a no-op.
-//
-// As an alternative to calling STLDeleteElements() directly, consider
-// STLElementDeleter (defined below), which ensures that your container's
-// elements are deleted when the STLElementDeleter goes out of scope.
-template <class T>
-void STLDeleteElements(T *container) {
-  if (!container) return;
-  STLDeleteContainerPointers(container->begin(), container->end());
-  container->clear();
-}
-
-// Given an STL container consisting of (key, value) pairs, STLDeleteValues
-// deletes all the "value" components and clears the container.  Does nothing
-// in the case it's given a NULL pointer.
-
-template <class T>
-void STLDeleteValues(T *v) {
-  if (!v) return;
-  for (typename T::iterator i = v->begin(); i != v->end(); ++i) {
-    delete i->second;
-  }
-  v->clear();
-}
-
-
-// The following classes provide a convenient way to delete all elements or
-// values from STL containers when they goes out of scope.  This greatly
-// simplifies code that creates temporary objects and has multiple return
-// statements.  Example:
-//
-// vector<MyProto *> tmp_proto;
-// STLElementDeleter<vector<MyProto *> > d(&tmp_proto);
-// if (...) return false;
-// ...
-// return success;
-
-// Given a pointer to an STL container this class will delete all the element
-// pointers when it goes out of scope.
-
-template<class STLContainer> class STLElementDeleter {
- public:
-  STLElementDeleter<STLContainer>(STLContainer *ptr) : container_ptr_(ptr) {}
-  ~STLElementDeleter<STLContainer>() { STLDeleteElements(container_ptr_); }
- private:
-  STLContainer *container_ptr_;
-};
-
-// Given a pointer to an STL container this class will delete all the value
-// pointers when it goes out of scope.
-
-template<class STLContainer> class STLValueDeleter {
- public:
-  STLValueDeleter<STLContainer>(STLContainer *ptr) : container_ptr_(ptr) {}
-  ~STLValueDeleter<STLContainer>() { STLDeleteValues(container_ptr_); }
- private:
-  STLContainer *container_ptr_;
-};
-
-
-// Forward declare some callback classes in callback.h for STLBinaryFunction
-template <class R, class T1, class T2>
-class ResultCallback2;
-
-// STLBinaryFunction is a wrapper for the ResultCallback2 class in callback.h
-// It provides an operator () method instead of a Run method, so it may be
-// passed to STL functions in <algorithm>.
-//
-// The client should create callback with NewPermanentCallback, and should
-// delete callback after it is done using the STLBinaryFunction.
-
-template <class Result, class Arg1, class Arg2>
-class STLBinaryFunction : public std::binary_function<Arg1, Arg2, Result> {
- public:
-  typedef ResultCallback2<Result, Arg1, Arg2> Callback;
-
-  STLBinaryFunction(Callback* callback)
-    : callback_(callback) {
-    assert(callback_);
-  }
-
-  Result operator() (Arg1 arg1, Arg2 arg2) {
-    return callback_->Run(arg1, arg2);
-  }
-
- private:
-  Callback* callback_;
-};
-
-// STLBinaryPredicate is a specialized version of STLBinaryFunction, where the
-// return type is bool and both arguments have type Arg.  It can be used
-// wherever STL requires a StrictWeakOrdering, such as in sort() or
-// lower_bound().
-//
-// templated typedefs are not supported, so instead we use inheritance.
-
-template <class Arg>
-class STLBinaryPredicate : public STLBinaryFunction<bool, Arg, Arg> {
- public:
-  typedef typename STLBinaryPredicate<Arg>::Callback Callback;
-  STLBinaryPredicate(Callback* callback)
-    : STLBinaryFunction<bool, Arg, Arg>(callback) {
-  }
-};
-
-// Functors that compose arbitrary unary and binary functions with a
-// function that "projects" one of the members of a pair.
-// Specifically, if p1 and p2, respectively, are the functions that
-// map a pair to its first and second, respectively, members, the
-// table below summarizes the functions that can be constructed:
-//
-// * UnaryOperate1st<pair>(f) returns the function x -> f(p1(x))
-// * UnaryOperate2nd<pair>(f) returns the function x -> f(p2(x))
-// * BinaryOperate1st<pair>(f) returns the function (x,y) -> f(p1(x),p1(y))
-// * BinaryOperate2nd<pair>(f) returns the function (x,y) -> f(p2(x),p2(y))
-//
-// A typical usage for these functions would be when iterating over
-// the contents of an STL map. For other sample usage, see the unittest.
-
-template<typename Pair, typename UnaryOp>
-class UnaryOperateOnFirst
-    : public std::unary_function<Pair, typename UnaryOp::result_type> {
- public:
-  UnaryOperateOnFirst() {
-  }
-
-  UnaryOperateOnFirst(const UnaryOp& f) : f_(f) {
-  }
-
-  typename UnaryOp::result_type operator()(const Pair& p) const {
-    return f_(p.first);
-  }
-
- private:
-  UnaryOp f_;
-};
-
-template<typename Pair, typename UnaryOp>
-UnaryOperateOnFirst<Pair, UnaryOp> UnaryOperate1st(const UnaryOp& f) {
-  return UnaryOperateOnFirst<Pair, UnaryOp>(f);
-}
-
-template<typename Pair, typename UnaryOp>
-class UnaryOperateOnSecond
-    : public std::unary_function<Pair, typename UnaryOp::result_type> {
- public:
-  UnaryOperateOnSecond() {
-  }
-
-  UnaryOperateOnSecond(const UnaryOp& f) : f_(f) {
-  }
-
-  typename UnaryOp::result_type operator()(const Pair& p) const {
-    return f_(p.second);
-  }
-
- private:
-  UnaryOp f_;
-};
-
-template<typename Pair, typename UnaryOp>
-UnaryOperateOnSecond<Pair, UnaryOp> UnaryOperate2nd(const UnaryOp& f) {
-  return UnaryOperateOnSecond<Pair, UnaryOp>(f);
-}
-
-template<typename Pair, typename BinaryOp>
-class BinaryOperateOnFirst
-    : public std::binary_function<Pair, Pair, typename BinaryOp::result_type> {
- public:
-  BinaryOperateOnFirst() {
-  }
-
-  BinaryOperateOnFirst(const BinaryOp& f) : f_(f) {
-  }
-
-  typename BinaryOp::result_type operator()(const Pair& p1,
-                                            const Pair& p2) const {
-    return f_(p1.first, p2.first);
-  }
-
- private:
-  BinaryOp f_;
-};
-
-template<typename Pair, typename BinaryOp>
-BinaryOperateOnFirst<Pair, BinaryOp> BinaryOperate1st(const BinaryOp& f) {
-  return BinaryOperateOnFirst<Pair, BinaryOp>(f);
-}
-
-template<typename Pair, typename BinaryOp>
-class BinaryOperateOnSecond
-    : public std::binary_function<Pair, Pair, typename BinaryOp::result_type> {
- public:
-  BinaryOperateOnSecond() {
-  }
-
-  BinaryOperateOnSecond(const BinaryOp& f) : f_(f) {
-  }
-
-  typename BinaryOp::result_type operator()(const Pair& p1,
-                                            const Pair& p2) const {
-    return f_(p1.second, p2.second);
-  }
-
- private:
-  BinaryOp f_;
-};
-
-template<typename Pair, typename BinaryOp>
-BinaryOperateOnSecond<Pair, BinaryOp> BinaryOperate2nd(const BinaryOp& f) {
-  return BinaryOperateOnSecond<Pair, BinaryOp>(f);
-}
-
-// Translates a set into a vector.
-template<typename T>
-std::vector<T> SetToVector(const std::set<T>& values) {
-  std::vector<T> result;
-  result.reserve(values.size());
-  result.insert(result.begin(), values.begin(), values.end());
-  return result;
-}
-
-// Test to see if a set, map, hash_set or hash_map contains a particular key.
-// Returns true if the key is in the collection.
-template <typename Collection, typename Key>
-bool ContainsKey(const Collection& collection, const Key& key) {
-  return collection.find(key) != collection.end();
-}
-
-#endif  // BASE_STL_UTIL_INL_H_

base/stl_util.h

@@ -0,0 +1,205 @@
+// Copyright (c) 2011 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.
+
+// Derived from google3/util/gtl/stl_util.h
+
+#ifndef BASE_STL_UTIL_H_
+#define BASE_STL_UTIL_H_
+#pragma once
+
+#include <assert.h>
+#include <string.h>  // for memcpy
+
+#include <string>
+#include <vector>
+
+// Clear internal memory of an STL object.
+// STL clear()/reserve(0) does not always free internal memory allocated
+// This function uses swap/destructor to ensure the internal memory is freed.
+template<class T> void STLClearObject(T* obj) {
+  T tmp;
+  tmp.swap(*obj);
+  // Sometimes "T tmp" allocates objects with memory (arena implementation?).
+  // Hence using additional reserve(0) even if it doesn't always work.
+  obj->reserve(0);
+}
+
+// STLDeleteContainerPointers()
+//  For a range within a container of pointers, calls delete
+//  (non-array version) on these pointers.
+// NOTE: for these three functions, we could just implement a DeleteObject
+// functor and then call for_each() on the range and functor, but this
+// requires us to pull in all of algorithm.h, which seems expensive.
+// For hash_[multi]set, it is important that this deletes behind the iterator
+// because the hash_set may call the hash function on the iterator when it is
+// advanced, which could result in the hash function trying to deference a
+// stale pointer.
+template <class ForwardIterator>
+void STLDeleteContainerPointers(ForwardIterator begin, ForwardIterator end) {
+  while (begin != end) {
+    ForwardIterator temp = begin;
+    ++begin;
+    delete *temp;
+  }
+}
+
+// STLDeleteContainerPairPointers()
+//  For a range within a container of pairs, calls delete
+//  (non-array version) on BOTH items in the pairs.
+// NOTE: Like STLDeleteContainerPointers, it is important that this deletes
+// behind the iterator because if both the key and value are deleted, the
+// container may call the hash function on the iterator when it is advanced,
+// which could result in the hash function trying to dereference a stale
+// pointer.
+template <class ForwardIterator>
+void STLDeleteContainerPairPointers(ForwardIterator begin,
+                                    ForwardIterator end) {
+  while (begin != end) {
+    ForwardIterator temp = begin;
+    ++begin;
+    delete temp->first;
+    delete temp->second;
+  }
+}
+
+// STLDeleteContainerPairFirstPointers()
+//  For a range within a container of pairs, calls delete (non-array version)
+//  on the FIRST item in the pairs.
+// NOTE: Like STLDeleteContainerPointers, deleting behind the iterator.
+template <class ForwardIterator>
+void STLDeleteContainerPairFirstPointers(ForwardIterator begin,
+                                         ForwardIterator end) {
+  while (begin != end) {
+    ForwardIterator temp = begin;
+    ++begin;
+    delete temp->first;
+  }
+}
+
+// STLDeleteContainerPairSecondPointers()
+//  For a range within a container of pairs, calls delete
+//  (non-array version) on the SECOND item in the pairs.
+template <class ForwardIterator>
+void STLDeleteContainerPairSecondPointers(ForwardIterator begin,
+                                          ForwardIterator end) {
+  while (begin != end) {
+    delete begin->second;
+    ++begin;
+  }
+}
+
+// To treat a possibly-empty vector as an array, use these functions.
+// If you know the array will never be empty, you can use &*v.begin()
+// directly, but that is undefined behaviour if v is empty.
+
+template<typename T>
+inline T* vector_as_array(std::vector<T>* v) {
+# ifdef NDEBUG
+  return &*v->begin();
+# else
+  return v->empty() ? NULL : &*v->begin();
+# endif
+}
+
+template<typename T>
+inline const T* vector_as_array(const std::vector<T>* v) {
+# ifdef NDEBUG
+  return &*v->begin();
+# else
+  return v->empty() ? NULL : &*v->begin();
+# endif
+}
+
+// Return a mutable char* pointing to a string's internal buffer,
+// which may not be null-terminated. Writing through this pointer will
+// modify the string.
+//
+// string_as_array(&str)[i] is valid for 0 <= i < str.size() until the
+// next call to a string method that invalidates iterators.
+//
+// As of 2006-04, there is no standard-blessed way of getting a
+// mutable reference to a string's internal buffer. However, issue 530
+// (http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#530)
+// proposes this as the method. According to Matt Austern, this should
+// already work on all current implementations.
+inline char* string_as_array(std::string* str) {
+  // DO NOT USE const_cast<char*>(str->data())
+  return str->empty() ? NULL : &*str->begin();
+}
+
+// The following functions are useful for cleaning up STL containers
+// whose elements point to allocated memory.
+
+// STLDeleteElements() deletes all the elements in an STL container and clears
+// the container.  This function is suitable for use with a vector, set,
+// hash_set, or any other STL container which defines sensible begin(), end(),
+// and clear() methods.
+//
+// If container is NULL, this function is a no-op.
+//
+// As an alternative to calling STLDeleteElements() directly, consider
+// STLElementDeleter (defined below), which ensures that your container's
+// elements are deleted when the STLElementDeleter goes out of scope.
+template <class T>
+void STLDeleteElements(T *container) {
+  if (!container) return;
+  STLDeleteContainerPointers(container->begin(), container->end());
+  container->clear();
+}
+
+// Given an STL container consisting of (key, value) pairs, STLDeleteValues
+// deletes all the "value" components and clears the container.  Does nothing
+// in the case it's given a NULL pointer.
+
+template <class T>
+void STLDeleteValues(T *v) {
+  if (!v) return;
+  for (typename T::iterator i = v->begin(); i != v->end(); ++i) {
+    delete i->second;
+  }
+  v->clear();
+}
+
+
+// The following classes provide a convenient way to delete all elements or
+// values from STL containers when they goes out of scope.  This greatly
+// simplifies code that creates temporary objects and has multiple return
+// statements.  Example:
+//
+// vector<MyProto *> tmp_proto;
+// STLElementDeleter<vector<MyProto *> > d(&tmp_proto);
+// if (...) return false;
+// ...
+// return success;
+
+// Given a pointer to an STL container this class will delete all the element
+// pointers when it goes out of scope.
+
+template<class STLContainer> class STLElementDeleter {
+ public:
+  STLElementDeleter<STLContainer>(STLContainer *ptr) : container_ptr_(ptr) {}
+  ~STLElementDeleter<STLContainer>() { STLDeleteElements(container_ptr_); }
+ private:
+  STLContainer *container_ptr_;
+};
+
+// Given a pointer to an STL container this class will delete all the value
+// pointers when it goes out of scope.
+
+template<class STLContainer> class STLValueDeleter {
+ public:
+  STLValueDeleter<STLContainer>(STLContainer *ptr) : container_ptr_(ptr) {}
+  ~STLValueDeleter<STLContainer>() { STLDeleteValues(container_ptr_); }
+ private:
+  STLContainer *container_ptr_;
+};
+
+// Test to see if a set, map, hash_set or hash_map contains a particular key.
+// Returns true if the key is in the collection.
+template <typename Collection, typename Key>
+bool ContainsKey(const Collection& collection, const Key& key) {
+  return collection.find(key) != collection.end();
+}
+
+#endif  // BASE_STL_UTIL_H_

base/task_queue.cc

@@ -5,7 +5,7 @@
 #include "base/task_queue.h"
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 TaskQueue::TaskQueue() {
 }

chrome/browser/autofill/autofill_country.cc

@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/autofill/autofill_download.cc

@@ -10,7 +10,7 @@
 
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_xml_parser.h"

chrome/browser/autofill/autofill_profile_unittest.cc

@@ -5,7 +5,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"

chrome/browser/autofill/autofill_regexes.cc

@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "unicode/regex.h"
 

chrome/browser/automation/automation_provider.cc

@@ -15,7 +15,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"

chrome/browser/automation/automation_resource_message_filter.cc

@@ -6,7 +6,7 @@
 
 #include "base/path_service.h"
 #include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/automation/url_request_automation_job.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/net/url_request_mock_util.h"

chrome/browser/background/background_application_list_model.cc

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <set>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_mode_manager.h"

chrome/browser/background/background_application_list_model_unittest.cc

@@ -14,7 +14,7 @@
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/common/extensions/extension.h"

chrome/browser/browsing_data_appcache_helper_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/browsing_data_appcache_helper.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/chromeos/cros/network_library.cc

@@ -6,12 +6,13 @@
 
 #include <algorithm>
 #include <map>
+#include <set>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"

chrome/browser/chromeos/extensions/file_browser_event_router.cc

@@ -6,7 +6,7 @@
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"

chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 namespace {
 const char kDefaultURLPath[] = "index.html";

chrome/browser/chromeos/login/views_login_display.cc

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"

chrome/browser/chromeos/login/wizard_accessibility_helper.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/prefs/pref_service.h"

chrome/browser/chromeos/network_message_observer.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/network_message_observer.h"
 
 #include "base/callback.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"

chrome/browser/chromeos/notifications/balloon_view_host.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/notifications/balloon_view_host.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/common/view_messages.h"

chrome/browser/chromeos/panels/panel_scroller.cc

@@ -6,7 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/panels/panel_scroller_container.h"

chrome/browser/command_updater.cc

@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/observer_list.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 CommandUpdater::CommandUpdaterDelegate::~CommandUpdaterDelegate() {
 }

chrome/browser/custom_handlers/protocol_handler_registry.cc

@@ -9,7 +9,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_service.h"

chrome/browser/diagnostics/diagnostics_model.cc

@@ -11,7 +11,7 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"

chrome/browser/download/download_browsertest.cc

@@ -7,7 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/download/download_file_manager.cc

@@ -6,7 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"

chrome/browser/download/download_manager.cc

@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"

chrome/browser/download/download_manager_unittest.cc

@@ -9,7 +9,7 @@
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"

chrome/browser/download/download_request_limiter.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/download/download_request_limiter.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/download/download_request_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

chrome/browser/extensions/crx_installer.cc

@@ -12,7 +12,7 @@
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/threading/thread_restrictions.h"

chrome/browser/extensions/extension_accessibility_api.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extension_tabs_module.h"
 
 #include "base/json/json_writer.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"

chrome/browser/extensions/extension_app_api.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_app_api.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/extensions/extension_bookmarks_module.cc

@@ -10,7 +10,7 @@
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"

chrome/browser/extensions/extension_content_settings_store.cc

@@ -7,7 +7,7 @@
 #include <set>
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_content_settings_api_constants.h"
 #include "chrome/browser/extensions/extension_content_settings_helpers.h"

chrome/browser/extensions/extension_icon_manager.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extension_icon_manager.h"
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"

chrome/browser/extensions/extension_idle_api.cc

@@ -11,7 +11,7 @@
 
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_event_router.h"

chrome/browser/extensions/extension_management_browsertest.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"

chrome/browser/extensions/extension_menu_manager.cc

@@ -8,7 +8,7 @@
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"

chrome/browser/extensions/extension_message_service.cc

@@ -6,7 +6,7 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"

chrome/browser/extensions/extension_pref_value_map.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 

chrome/browser/extensions/extension_preference_api.cc

@@ -8,7 +8,7 @@
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"

chrome/browser/extensions/extension_prefs_unittest.cc

@@ -5,7 +5,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_prefs.h"

chrome/browser/extensions/extension_service.cc

@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"

chrome/browser/extensions/extension_service_unittest.cc

@@ -16,7 +16,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"

chrome/browser/extensions/extension_updater.cc

@@ -13,7 +13,7 @@
 #include "base/memory/scoped_handle.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"

chrome/browser/extensions/extension_updater_unittest.cc

@@ -8,7 +8,7 @@
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"

chrome/browser/extensions/extensions_quota_service.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extensions_quota_service.h"
 
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_function.h"
 
 // If the browser stays open long enough, we reset state once a day.

chrome/browser/extensions/extensions_quota_service_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"

chrome/browser/extensions/pending_extension_manager.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/common/extensions/extension.h"

chrome/browser/extensions/user_script_master.cc

@@ -10,7 +10,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/pickle.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/version.h"

chrome/browser/history/history_types.cc

@@ -7,7 +7,7 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 namespace history {
 

chrome/browser/history/query_parser.cc

@@ -10,7 +10,7 @@
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 namespace {
 

chrome/browser/history/starred_url_database.cc

@@ -8,7 +8,7 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"

chrome/browser/history/visit_tracker.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/history/visit_tracker.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 namespace history {
 

chrome/browser/history/visitsegment_database.cc

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/page_usage_data.h"

chrome/browser/icon_manager.cc

@@ -6,7 +6,7 @@
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 

chrome/browser/importer/firefox2_importer.cc

@@ -12,7 +12,7 @@
 #include "base/i18n/icu_string_conversions.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"

chrome/browser/importer/firefox3_importer.cc

@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/importer/importer_unittest.cc

@@ -21,7 +21,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_com_initializer.h"

chrome/browser/intranet_redirect_detector.cc

@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"

chrome/browser/io_thread.cc

@@ -10,7 +10,7 @@
 #include "base/debug/leak_tracker.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"

chrome/browser/net/chrome_dns_cert_provenance_checker.cc

@@ -5,15 +5,15 @@
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "net/url_request/url_request.h"
 
 namespace {
 
-class ChromeDnsCertProvenanceChecker :
-    public net::DnsCertProvenanceChecker,
-    public net::DnsCertProvenanceChecker::Delegate {
+class ChromeDnsCertProvenanceChecker
+    : public net::DnsCertProvenanceChecker,
+      public net::DnsCertProvenanceChecker::Delegate {
  public:
   ChromeDnsCertProvenanceChecker(
       net::DnsRRResolver* dnsrr_resolver,

chrome/browser/net/predictor_api.cc

@@ -9,7 +9,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"

chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc

@@ -6,7 +6,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/test/thread_test_helper.h"
 #include "base/time.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"

chrome/browser/notifications/balloon_collection_base.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/notifications/balloon_collection_base.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification.h"
 #include "googleurl/src/gurl.h"

chrome/browser/notifications/balloon_collection_impl.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/notification.h"

chrome/browser/notifications/notification_ui_manager.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/idle.h"

chrome/browser/parsers/metadata_parser_manager.cc

@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "base/memory/singleton.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/parsers/metadata_parser_factory.h"
 #include "chrome/browser/parsers/metadata_parser_jpeg_factory.h"

chrome/browser/password_manager/native_backend_kwallet_x.cc

@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/pickle.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
 #include "grit/chromium_strings.h"

chrome/browser/password_manager/password_form_manager.h

@@ -11,7 +11,7 @@
 
 #include "build/build_config.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "webkit/glue/password_form.h"
 

chrome/browser/password_manager/password_manager.cc

@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_manager.h"

chrome/browser/password_manager/password_manager.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/login/login_model.h"

chrome/browser/password_manager/password_store.cc

@@ -6,7 +6,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/task.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "content/browser/browser_thread.h"

chrome/browser/password_manager/password_store_default.cc

@@ -7,7 +7,7 @@
 #include <set>
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/password_manager/password_store_default_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"

chrome/browser/password_manager/password_store_mac.cc

@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"

chrome/browser/password_manager/password_store_mac_unittest.cc

@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/mock_keychain_mac.h"

chrome/browser/password_manager/password_store_win_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/ie7_password.h"

chrome/browser/password_manager/password_store_x.cc

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"

chrome/browser/password_manager/password_store_x_unittest.cc

@@ -6,7 +6,7 @@
 #include "base/file_util.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"

chrome/browser/policy/configuration_policy_pref_store.cc

@@ -12,7 +12,7 @@
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"

chrome/browser/policy/configuration_policy_provider_mac_unittest.cc

@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "base/mac/scoped_cftyperef.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider_mac.h"

chrome/browser/policy/configuration_policy_provider_win_unittest.cc

@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"

chrome/browser/policy/mock_configuration_policy_provider.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 
 namespace policy {

chrome/browser/policy/mock_configuration_policy_store.h

@@ -9,7 +9,7 @@
 #include <map>
 #include <utility>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_store_interface.h"
 #include "chrome/browser/policy/policy_map.h"

chrome/browser/policy/policy_map.cc

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 
 namespace policy {
 

chrome/browser/prefs/pref_notifier_impl.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/prefs/pref_notifier_impl.h"
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_observer.h"

chrome/browser/prefs/pref_service.cc

@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/value_conversions.h"

chrome/browser/prefs/pref_value_map.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 
 PrefValueMap::PrefValueMap() {}

chrome/browser/prefs/value_map_pref_store.cc

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 
 ValueMapPrefStore::ValueMapPrefStore() {}

chrome/browser/process_singleton_linux.cc

@@ -67,7 +67,7 @@
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/safe_strerror_posix.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"

chrome/browser/profiles/off_the_record_profile_io_data.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"

chrome/browser/profiles/profile_impl_io_data.cc

@@ -8,7 +8,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"

chrome/browser/profiles/profile_io_data.cc

@@ -11,7 +11,7 @@
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/profiles/profile_manager.cc

@@ -10,7 +10,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"

chrome/browser/safe_browsing/browser_feature_extractor.cc

@@ -7,7 +7,7 @@
 #include <map>
 #include <utility>
 
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/common/safe_browsing/csd.pb.h"

chrome/browser/safe_browsing/client_side_detection_service.cc

@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/common/net/http_return.h"