diff options
272 files changed, 483 insertions, 727 deletions
@@ -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", diff --git a/base/base.gypi b/base/base.gypi index ea23a8e..8c7945a 100644 --- a/base/base.gypi +++ b/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', diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc index 04567a8..49b652f 100644 --- a/base/files/file_path_watcher_browsertest.cc +++ b/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" diff --git a/base/memory/scoped_vector.h b/base/memory/scoped_vector.h index 6e0cf05..832d9dd 100644 --- a/base/memory/scoped_vector.h +++ b/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. diff --git a/base/stl_util-inl.h b/base/stl_util-inl.h deleted file mode 100644 index 2161c59..0000000 --- a/base/stl_util-inl.h +++ /dev/null @@ -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_ diff --git a/base/stl_util.h b/base/stl_util.h new file mode 100644 index 0000000..299c595 --- /dev/null +++ b/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_ diff --git a/base/task_queue.cc b/base/task_queue.cc index fdff8ac..78ab159 100644 --- a/base/task_queue.cc +++ b/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() { } diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index 897d543..0a218a1 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/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" diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index 4b66009..bc5fd17 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/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" diff --git a/chrome/browser/autofill/autofill_profile_unittest.cc b/chrome/browser/autofill/autofill_profile_unittest.cc index 8bfb3ba..28bf838 100644 --- a/chrome/browser/autofill/autofill_profile_unittest.cc +++ b/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" diff --git a/chrome/browser/autofill/autofill_regexes.cc b/chrome/browser/autofill/autofill_regexes.cc index 5329958..b1ed629 100644 --- a/chrome/browser/autofill/autofill_regexes.cc +++ b/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" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 26486c3..745928b 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/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" diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index d036b8d..ddc3b65 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/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" diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index ac6d012..cbb74f2 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/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" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 1a6856e..d975e60 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/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" diff --git a/chrome/browser/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data_appcache_helper_unittest.cc index d80f5c6..1b9e2f8 100644 --- a/chrome/browser/browsing_data_appcache_helper_unittest.cc +++ b/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" diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 78cd61f..84886b1 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/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" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index d4fb184..d78b176 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/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" diff --git a/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc b/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc index ac7394d..1e427ad 100644 --- a/chrome/browser/chromeos/input_method/virtual_keyboard_selector.cc +++ b/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"; diff --git a/chrome/browser/chromeos/login/views_login_display.cc b/chrome/browser/chromeos/login/views_login_display.cc index 6f5654b..26e6683 100644 --- a/chrome/browser/chromeos/login/views_login_display.cc +++ b/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" diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index 61937ee..1731a67 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/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" diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index c872d87..93448af 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/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" diff --git a/chrome/browser/chromeos/notifications/balloon_view_host.cc b/chrome/browser/chromeos/notifications/balloon_view_host.cc index 1a2a946..707225e 100644 --- a/chrome/browser/chromeos/notifications/balloon_view_host.cc +++ b/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" diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc index 1069d67..e40154b 100644 --- a/chrome/browser/chromeos/panels/panel_scroller.cc +++ b/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" diff --git a/chrome/browser/command_updater.cc b/chrome/browser/command_updater.cc index b55b09b..4a1b0db 100644 --- a/chrome/browser/command_updater.cc +++ b/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() { } diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 8b7f42b..053fa85 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/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" diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index b3ff24d..8182514 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/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" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 7bebb65..2f5ca58 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/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" diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc index 1b6b267..ac0c55e 100644 --- a/chrome/browser/download/download_file_manager.cc +++ b/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" diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 3e0cf36..a9fd017 100644 --- a/chrome/browser/download/download_manager.cc +++ b/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" diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index 1b80445..fe82fe8 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/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" diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index 2f29b4a..ea9c73f 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/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" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index a1b672c..4d87f124 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_accessibility_api.cc b/chrome/browser/extensions/extension_accessibility_api.cc index 6b00cc8..f632342 100644 --- a/chrome/browser/extensions/extension_accessibility_api.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_app_api.cc b/chrome/browser/extensions/extension_app_api.cc index 6a95255..91899e9 100644 --- a/chrome/browser/extensions/extension_app_api.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc index bc65a27..1992eb8 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/extension_content_settings_store.cc index 395c3bb..779baf9 100644 --- a/chrome/browser/extensions/extension_content_settings_store.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index 04966ac..8874209 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index 35600fa..bf22ecc 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index 502a38a..7dafb3c 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 71f24b7..a510392 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 73e37b8..756ec4e 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc index a11fac3..9d2ef06 100644 --- a/chrome/browser/extensions/extension_pref_value_map.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index da463ddb..b0ada5f 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index b58ecff..5098e77 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 755c7d6..61649ce 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index a6b896d..786f69e 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 797b371..ae62dca 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/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" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index d87df5a..6e6319d 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/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" diff --git a/chrome/browser/extensions/extensions_quota_service.cc b/chrome/browser/extensions/extensions_quota_service.cc index 7a404642..0c41656 100644 --- a/chrome/browser/extensions/extensions_quota_service.cc +++ b/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. diff --git a/chrome/browser/extensions/extensions_quota_service_unittest.cc b/chrome/browser/extensions/extensions_quota_service_unittest.cc index feb7da2..07c724f 100644 --- a/chrome/browser/extensions/extensions_quota_service_unittest.cc +++ b/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" diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc index b4b251c..d4446a9 100644 --- a/chrome/browser/extensions/pending_extension_manager.cc +++ b/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" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 958e0ab..758700c 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/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" diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc index 01f0200..0dfa96d7 100644 --- a/chrome/browser/history/history_types.cc +++ b/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 { diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc index d507bd1..782c708 100644 --- a/chrome/browser/history/query_parser.cc +++ b/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 { diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc index 36ae56a..edfa221 100644 --- a/chrome/browser/history/starred_url_database.cc +++ b/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" diff --git a/chrome/browser/history/visit_tracker.cc b/chrome/browser/history/visit_tracker.cc index 7bb0011..1dc2f18 100644 --- a/chrome/browser/history/visit_tracker.cc +++ b/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 { diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc index f0b04a9..ac2afe8 100644 --- a/chrome/browser/history/visitsegment_database.cc +++ b/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" diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc index 500ed6e..22613db 100644 --- a/chrome/browser/icon_manager.cc +++ b/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" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 6b18a5b..cb023e3 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/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" diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 876d770..e183f76 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/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" diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index 7404131..d58ba19 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/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" diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 36d35c1..75fab0e 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/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" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 1de2126..11d8827 100644 --- a/chrome/browser/io_thread.cc +++ b/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" diff --git a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc index d3ea8c4..ba32c5f 100644 --- a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc +++ b/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, diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index 1d63ede..6856327 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/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" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc index 354f2db..f3e52cc 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/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" diff --git a/chrome/browser/notifications/balloon_collection_base.cc b/chrome/browser/notifications/balloon_collection_base.cc index b0551dde..4e9ab50f 100644 --- a/chrome/browser/notifications/balloon_collection_base.cc +++ b/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" diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc index 846bd96..c8bd6bf 100644 --- a/chrome/browser/notifications/balloon_collection_impl.cc +++ b/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" diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc index 2a4060f..2d66214 100644 --- a/chrome/browser/notifications/notification_ui_manager.cc +++ b/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" diff --git a/chrome/browser/parsers/metadata_parser_manager.cc b/chrome/browser/parsers/metadata_parser_manager.cc index 1cc249c..8336d23 100644 --- a/chrome/browser/parsers/metadata_parser_manager.cc +++ b/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" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 9e7c172..064cb33 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h index f1c48bc..1fd0fbd 100644 --- a/chrome/browser/password_manager/password_form_manager.h +++ b/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" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 9f98545..1f4bf4d 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index ce94a54..6f23a99 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/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" diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc index 09ed969..dea36e8 100644 --- a/chrome/browser/password_manager/password_store.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_default.cc b/chrome/browser/password_manager/password_store_default.cc index d3f66f4..0ebf601 100644 --- a/chrome/browser/password_manager/password_store_default.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 57651c4..f77f01d 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 48182e5..033b86c 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc index 2db2294..67a809a5 100644 --- a/chrome/browser/password_manager/password_store_mac_unittest.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 5b21ed2..52349d4 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc index 3a621c5..397d509 100644 --- a/chrome/browser/password_manager/password_store_x.cc +++ b/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" diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index efcec40..de9a69f 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/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" diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 9cfdb62..6590035 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/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" diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index 3a486cf..512307f 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/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" diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index b2cc3ce..af2fd2b 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/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" diff --git a/chrome/browser/policy/mock_configuration_policy_provider.cc b/chrome/browser/policy/mock_configuration_policy_provider.cc index 46f997c..d09db10 100644 --- a/chrome/browser/policy/mock_configuration_policy_provider.cc +++ b/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 { diff --git a/chrome/browser/policy/mock_configuration_policy_store.h b/chrome/browser/policy/mock_configuration_policy_store.h index 14e4597..658c82d 100644 --- a/chrome/browser/policy/mock_configuration_policy_store.h +++ b/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" diff --git a/chrome/browser/policy/policy_map.cc b/chrome/browser/policy/policy_map.cc index 50c8c42..894d62a 100644 --- a/chrome/browser/policy/policy_map.cc +++ b/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 { diff --git a/chrome/browser/prefs/pref_notifier_impl.cc b/chrome/browser/prefs/pref_notifier_impl.cc index cdf67294..2dd454f 100644 --- a/chrome/browser/prefs/pref_notifier_impl.cc +++ b/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" diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 5c46f2e..cd9dcf8 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/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" diff --git a/chrome/browser/prefs/pref_value_map.cc b/chrome/browser/prefs/pref_value_map.cc index 54967e1..b810519 100644 --- a/chrome/browser/prefs/pref_value_map.cc +++ b/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() {} diff --git a/chrome/browser/prefs/value_map_pref_store.cc b/chrome/browser/prefs/value_map_pref_store.cc index 39ee3a1..6eeb79b 100644 --- a/chrome/browser/prefs/value_map_pref_store.cc +++ b/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() {} diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index 8ed50c9..9055e59 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/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" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 2995816..2d9b368 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/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" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index ccadce3..f917b1a 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/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" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 2694cc9..e8695f3 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/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" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index dff50d7..bebade40 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 84eca0f..d56e0ab 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 479fc77..f9b984a 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/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" diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index dfc4b82..78c1bab 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_util.h" #include "base/task.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index bd6e891..88710ef 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index e14d60f..25ae82a 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/search_engines/search_engine_type.h" diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 3c0db83..e60357b 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/i18n/case_conversion.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" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 71c75f3..9557af2 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index ba14c5d..ced2639 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sessions/base_session_service.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc index 61503d4..d28d4f5 100644 --- a/chrome/browser/sessions/session_backend_unittest.cc +++ b/chrome/browser/sessions/session_backend_unittest.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "chrome/browser/sessions/session_backend.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 77f3961..163e488 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -13,7 +13,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 4005728..b748005 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_vector.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/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h index d597379..e107b3f 100644 --- a/chrome/browser/sessions/session_types.h +++ b/chrome/browser/sessions/session_types.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/time.h" #include "chrome/browser/sessions/session_id.h" diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 886afbe..7391612 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 740e518..7b450bb 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.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/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/chrome/browser/status_icons/status_tray.cc b/chrome/browser/status_icons/status_tray.cc index 84de8e0..2a72cd6 100644 --- a/chrome/browser/status_icons/status_tray.cc +++ b/chrome/browser/status_icons/status_tray.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/status_icons/status_icon.h" StatusTray::StatusTray() { diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc index 1a2ba36..32e6ce7 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc @@ -8,7 +8,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/sync/engine/configure_reason.h" #include "chrome/browser/sync/glue/data_type_controller.h" diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc index 2931e94..1a1ca01 100644 --- a/chrome/browser/sync/glue/password_model_associator.cc +++ b/chrome/browser/sync/glue/password_model_associator.cc @@ -6,7 +6,7 @@ #include <set> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store.h" diff --git a/chrome/browser/sync/notifier/chrome_system_resources.cc b/chrome/browser/sync/notifier/chrome_system_resources.cc index 0965c09..ede395c 100644 --- a/chrome/browser/sync/notifier/chrome_system_resources.cc +++ b/chrome/browser/sync/notifier/chrome_system_resources.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h" diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 3ac6a79..3c14317 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -6,7 +6,7 @@ #include <string> #include "base/json/json_reader.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/task.h" #include "base/tracked.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index e470daf..5065ac8 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -8,7 +8,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/task.h" #include "base/tracked.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h index 0f76782..f8c6893 100644 --- a/chrome/browser/sync/sessions/status_controller.h +++ b/chrome/browser/sync/sessions/status_controller.h @@ -36,7 +36,7 @@ #include <vector> #include <map> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/sync/sessions/ordered_commit_set.h" #include "chrome/browser/sync/sessions/session_state.h" diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc index 16b7d0d..d53def0 100644 --- a/chrome/browser/sync/sync_setup_wizard_unittest.cc +++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/engine/syncapi.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index b5108d2..e256eb8 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -16,7 +16,7 @@ #include "base/hash_tables.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc index 892298a5..f05bc6f 100644 --- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc +++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.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 "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/protocol/sync.pb.h" diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index 9556b2d..0722c2d 100644 --- a/chrome/browser/sync/syncable/syncable.cc +++ b/chrome/browser/sync/syncable/syncable.cc @@ -34,7 +34,7 @@ #include "base/perftimer.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "base/tracked.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index b402e29..3cbbcea 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/tabs/tab_finder.cc b/chrome/browser/tabs/tab_finder.cc index 2f06211..ec2ca0e 100644 --- a/chrome/browser/tabs/tab_finder.cc +++ b/chrome/browser/tabs/tab_finder.cc @@ -5,7 +5,7 @@ #include "chrome/browser/tabs/tab_finder.h" #include "base/command_line.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 29d459c..95679c4 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -8,7 +8,7 @@ #include <map> #include "base/command_line.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 72234dd..5e09b6d 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.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" diff --git a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc index 66c9372..3568c29 100644 --- a/chrome/browser/task_manager/task_manager_notification_resource_provider.cc +++ b/chrome/browser/task_manager/task_manager_notification_resource_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "base/basictypes.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/balloon_host.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 46ad4e9..006ce75 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -8,7 +8,7 @@ #include "base/file_version_info.h" #include "base/i18n/rtl.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index e43a485..6b1f940 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -4,7 +4,7 @@ #include "chrome/browser/themes/browser_theme_pack.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index f3c5490..33f4b03 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -5,7 +5,7 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" #include "base/callback.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/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 23d887a..d6cc961 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index 50e74b6..d203431 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -6,7 +6,7 @@ #include <cmath> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc index 7938324..6ac4dd8 100644 --- a/chrome/browser/ui/gtk/global_history_menu.cc +++ b/chrome/browser/ui/gtk/global_history_menu.cc @@ -6,7 +6,7 @@ #include <gtk/gtk.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/history/top_sites.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index e624c02..a09d79a 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -11,7 +11,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index d120579..9d76219 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" -#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/ui/gtk/gtk_custom_menu.h" diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc index 4df64aa..f4c9ccf 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 7202ced..6690a16 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -6,7 +6,7 @@ #include "base/callback.h" #include "base/i18n/rtl.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index a42d65d..3307ea3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 6a178f2..a3e8cfa 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 04b2487..cc124c8 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/browser_actions_container.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/extensions/extension_browser_event_router.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index b87739b..9cacd23 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -9,7 +9,7 @@ #endif #include "base/command_line.h" -#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/alternate_nav_url_fetcher.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc index eff832e..f28c49b 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/tabs/dragged_tab_view.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "chrome/browser/ui/views/tabs/native_view_photobooth.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index ed5db47..4aa8f0e 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tabs/tab_strip_selection_model.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc index 1b21684..b38c273 100644 --- a/chrome/browser/ui/webui/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extension_icon_source.cc @@ -6,7 +6,7 @@ #include "base/callback.h" #include "base/memory/ref_counted_memory.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" diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index e4e67e2..d375c56 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc index c452aa7..fcd9ab3 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc @@ -8,7 +8,7 @@ #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/stringprintf.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 9ac429f..90505a0 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index cc77219..637e13a 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/webdata/web_data_service.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/threading/thread.h" #include "chrome/browser/autofill/autofill_profile.h" diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 0f7d861..6d83fbf 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index 4f4d1bd..271ebcd 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -6,7 +6,7 @@ #include "base/file_util.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/time.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 49dd2db..6585b68 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -14,7 +14,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/memory/singleton.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" diff --git a/chrome/common/extensions/extension_message_bundle.cc b/chrome/common/extensions/extension_message_bundle.cc index a3740a9..ea45721 100644 --- a/chrome/common/extensions/extension_message_bundle.cc +++ b/chrome/common/extensions/extension_message_bundle.cc @@ -12,7 +12,7 @@ #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc index 713898f..60ac292 100644 --- a/chrome/common/extensions/update_manifest.cc +++ b/chrome/common/extensions/update_manifest.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc index 15ae2c2..fdbd79b 100644 --- a/chrome/common/sqlite_utils.cc +++ b/chrome/common/sqlite_utils.cc @@ -9,7 +9,7 @@ #include "base/file_path.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/synchronization/lock.h" diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index fcce1ea..8ce4b25 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 6dad7c7..93aee71 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -17,7 +17,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_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" diff --git a/chrome/renderer/autofill/form_manager.cc b/chrome/renderer/autofill/form_manager.cc index 9245a94..d2dda89 100644 --- a/chrome/renderer/autofill/form_manager.cc +++ b/chrome/renderer/autofill/form_manager.cc @@ -6,7 +6,7 @@ #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 "grit/generated_resources.h" diff --git a/chrome/renderer/extensions/user_script_slave.h b/chrome/renderer/extensions/user_script_slave.h index d35b17d..9e73be7 100644 --- a/chrome/renderer/extensions/user_script_slave.h +++ b/chrome/renderer/extensions/user_script_slave.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc index 2e22b19..b77dfc4 100644 --- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc +++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_path.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/test/test_timeouts.h" #include "base/test/thread_test_helper.h" #include "chrome/app/chrome_command_ids.h" diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index 7beb07a..addca3d 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -11,7 +11,7 @@ #include "base/metrics/histogram.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_util.h" #include "content/browser/browser_thread.h" #include "content/browser/content_browser_client.h" diff --git a/content/browser/cert_store.cc b/content/browser/cert_store.cc index a5ecee8..44acfe4 100644 --- a/content/browser/cert_store.cc +++ b/content/browser/cert_store.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <functional> -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/common/notification_service.h" diff --git a/content/browser/child_process_security_policy.cc b/content/browser/child_process_security_policy.cc index 61c2c46..81d3964 100644 --- a/content/browser/child_process_security_policy.cc +++ b/content/browser/child_process_security_policy.cc @@ -7,7 +7,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/platform_file.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "content/common/bindings_policy.h" #include "content/common/url_constants.h" diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 16b900a..0004686 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/task.h" #include "base/threading/thread.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 6c2d3ea..8670bb8 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -11,7 +11,7 @@ #include "base/i18n/file_util_icu.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/string_split.h" #include "base/sys_string_conversions.h" diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc index 123eb22..7c71dc2 100644 --- a/content/browser/renderer_host/browser_render_process_host.cc +++ b/content/browser/renderer_host/browser_render_process_host.cc @@ -22,7 +22,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/platform_file.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc index 7add237..2e450b3 100644 --- a/content/browser/renderer_host/clipboard_message_filter.cc +++ b/content/browser/renderer_host/clipboard_message_filter.cc @@ -10,7 +10,7 @@ #include "third_party/zlib/zlib.h" #endif -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/clipboard_dispatcher.h" #include "content/browser/content_browser_client.h" #include "content/common/clipboard_messages.h" diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc index e4a27db..54834e8 100644 --- a/content/browser/renderer_host/media/media_stream_device_settings.cc +++ b/content/browser/renderer_host/media/media_stream_device_settings.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/media/media_stream_device_settings.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_settings_requester.h" diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index 7d84ea1..e1d5d28 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/media/video_capture_controller.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/video_capture_manager.h" diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc index 157a41a..d3192d6 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc @@ -5,7 +5,7 @@ #include "content/browser/renderer_host/media/video_capture_host.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/common/media/video_capture_messages.h" VideoCaptureHost::VideoCaptureHost() {} diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc index 088e2f3..9e54881 100644 --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/stringprintf.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/media/media_stream_manager.h" diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index f1e9e36..da92782 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/renderer_host/p2p/socket_host.h" #include "content/common/p2p_messages.h" diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc index 5578c79..91140be 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/p2p/socket_host_tcp_server.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/renderer_host/p2p/socket_host_tcp.h" #include "content/common/p2p_messages.h" #include "net/base/address_list.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index 5bb7e05..28ef467 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/shared_memory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "chrome/browser/download/download_file_manager.h" #include "chrome/browser/download/download_manager.h" diff --git a/content/browser/renderer_host/resource_queue.cc b/content/browser/renderer_host/resource_queue.cc index d08b246..59d7078 100644 --- a/content/browser/renderer_host/resource_queue.cc +++ b/content/browser/renderer_host/resource_queue.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/resource_queue.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index 444d372..f286d14 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" diff --git a/content/browser/speech/audio_encoder.cc b/content/browser/speech/audio_encoder.cc index cd1132f..683ec0e 100644 --- a/content/browser/speech/audio_encoder.cc +++ b/content/browser/speech/audio_encoder.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "third_party/flac/flac.h" #include "third_party/speex/speex.h" diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc index 3ce0d3d..782af71 100644 --- a/content/browser/tab_contents/navigation_controller_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_unittest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" // These are only used for commented out tests. If someone wants to enable diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc index 40209ab..4fed4da 100644 --- a/content/browser/webui/web_ui.cc +++ b/content/browser/webui/web_ui.cc @@ -6,7 +6,7 @@ #include "base/i18n/rtl.h" #include "base/json/json_writer.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 "base/values.h" diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 1556e4c..ca25938 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "gpu/command_buffer/common/command_buffer.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc index 245da89..43a4abf 100644 --- a/content/common/gpu/media/omx_video_decode_accelerator.cc +++ b/content/common/gpu/media/omx_video_decode_accelerator.cc @@ -4,7 +4,7 @@ #include "content/common/gpu/media/omx_video_decode_accelerator.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" diff --git a/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc b/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc index 6884a88..3065525 100644 --- a/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/omx_video_decode_accelerator_unittest.cc @@ -27,7 +27,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_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/stringize_macros.h" diff --git a/content/common/unix_domain_socket_posix.cc b/content/common/unix_domain_socket_posix.cc index f732366..3e2e2ec 100644 --- a/content/common/unix_domain_socket_posix.cc +++ b/content/common/unix_domain_socket_posix.cc @@ -12,7 +12,7 @@ #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" // static bool UnixDomainSocket::SendMsg(int fd, diff --git a/content/common/url_fetcher.cc b/content/common/url_fetcher.cc index 02e27b1..c54c0d7 100644 --- a/content/common/url_fetcher.cc +++ b/content/common/url_fetcher.cc @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" #include "googleurl/src/gurl.h" diff --git a/content/renderer/gpu/transport_texture_service.cc b/content/renderer/gpu/transport_texture_service.cc index 59b22d0..a0d9292 100644 --- a/content/renderer/gpu/transport_texture_service.cc +++ b/content/renderer/gpu/transport_texture_service.cc @@ -4,7 +4,7 @@ #include "content/renderer/gpu/transport_texture_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/common/child_process.h" #include "content/common/gpu/gpu_messages.h" #include "content/renderer/gpu/transport_texture_host.h" diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index 8ebdce0..b4236a0 100644 --- a/content/renderer/media/video_capture_impl.cc +++ b/content/renderer/media/video_capture_impl.cc @@ -4,7 +4,7 @@ #include "content/renderer/media/video_capture_impl.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/common/child_process.h" #include "content/common/media/video_capture_messages.h" diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc index 558d28d..ca5e011 100644 --- a/content/renderer/media/video_capture_impl_manager.cc +++ b/content/renderer/media/video_capture_impl_manager.cc @@ -4,7 +4,7 @@ #include "content/renderer/media/video_capture_impl_manager.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "content/renderer/media/video_capture_impl.h" #include "content/renderer/media/video_capture_message_filter.h" diff --git a/content/renderer/web_ui_bindings.cc b/content/renderer/web_ui_bindings.cc index 9cecd9d..97037a4 100644 --- a/content/renderer/web_ui_bindings.cc +++ b/content/renderer/web_ui_bindings.cc @@ -5,7 +5,7 @@ #include "content/renderer/web_ui_bindings.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "content/common/view_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" diff --git a/crypto/hmac_openssl.cc b/crypto/hmac_openssl.cc index 74645c7..3ea1c6a 100644 --- a/crypto/hmac_openssl.cc +++ b/crypto/hmac_openssl.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/crypto/rsa_private_key_openssl.cc b/crypto/rsa_private_key_openssl.cc index f39b718..b9902a0 100644 --- a/crypto/rsa_private_key_openssl.cc +++ b/crypto/rsa_private_key_openssl.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" #include "crypto/openssl_util.h" namespace crypto { @@ -41,7 +40,8 @@ bool ExportKey(EVP_PKEY* key, if (!data || len < 0) return false; - STLAssignToVector(output, reinterpret_cast<const uint8*>(data), len); + std::vector<uint8> for_output(data, data + len); + output->swap(for_output); return true; } diff --git a/crypto/sha2.cc b/crypto/sha2.cc index 7c9b9d2..7626bdc 100644 --- a/crypto/sha2.cc +++ b/crypto/sha2.cc @@ -5,7 +5,7 @@ #include "crypto/sha2.h" #include "base/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/secure_hash.h" namespace crypto { diff --git a/crypto/signature_creator_openssl.cc b/crypto/signature_creator_openssl.cc index e6aa422..d12d166 100644 --- a/crypto/signature_creator_openssl.cc +++ b/crypto/signature_creator_openssl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/crypto/signature_verifier_openssl.cc b/crypto/signature_verifier_openssl.cc index 2a58155..cab45db 100644 --- a/crypto/signature_verifier_openssl.cc +++ b/crypto/signature_verifier_openssl.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 9cb78aa..462d442 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -24,7 +24,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/lock.h" #include "ipc/ipc_descriptors.h" diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index f94e949..3bd2fda 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -13,7 +13,7 @@ #include "base/logging.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/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc index 4dcfe77..617724f 100644 --- a/media/audio/linux/alsa_output.cc +++ b/media/audio/linux/alsa_output.cc @@ -43,7 +43,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/time.h" #include "media/audio/audio_util.h" #include "media/audio/linux/alsa_util.h" diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index d178efba..4d6e2a3 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "media/audio/audio_output_dispatcher.h" #include "media/audio/fake_audio_input_stream.h" #include "media/audio/fake_audio_output_stream.h" diff --git a/media/base/async_filter_factory_base.cc b/media/base/async_filter_factory_base.cc index ce09c60..c8bb307 100644 --- a/media/base/async_filter_factory_base.cc +++ b/media/base/async_filter_factory_base.cc @@ -5,7 +5,7 @@ #include "media/base/async_filter_factory_base.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace media { diff --git a/media/base/composite_data_source_factory.cc b/media/base/composite_data_source_factory.cc index d002a08..9703c85 100644 --- a/media/base/composite_data_source_factory.cc +++ b/media/base/composite_data_source_factory.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace media { diff --git a/media/base/composite_filter.cc b/media/base/composite_filter.cc index c765978..a84bf21 100644 --- a/media/base/composite_filter.cc +++ b/media/base/composite_filter.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "media/base/callback.h" namespace media { diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index bfeda09..4dda8ed 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/condition_variable.h" #include "media/base/clock.h" diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index c0a85b3..3758ae8 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/simple_thread.h" #include "media/base/pipeline_impl.h" #include "media/base/media_format.h" diff --git a/media/base/state_matrix.cc b/media/base/state_matrix.cc index f0ef07b..0d71a9c 100644 --- a/media/base/state_matrix.cc +++ b/media/base/state_matrix.cc @@ -4,7 +4,7 @@ #include "media/base/state_matrix.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace media { diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc index cd9b3a4..b0be7ae 100644 --- a/media/filters/audio_renderer_base_unittest.cc +++ b/media/filters/audio_renderer_base_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 "media/base/data_buffer.h" #include "media/base/mock_callback.h" #include "media/base/mock_filter_host.h" diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h index 338b036..dc283f8 100644 --- a/media/filters/decoder_base.h +++ b/media/filters/decoder_base.h @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/threading/thread.h" #include "media/base/buffers.h" diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index b126acf..1dae5cc 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -6,7 +6,7 @@ #include "base/command_line.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/time.h" #include "media/base/filter_host.h" diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 3605011..a6d6716 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "media/base/callback.h" #include "media/base/data_buffer.h" #include "media/base/limits.h" diff --git a/net/base/cert_verifier.cc b/net/base/cert_verifier.cc index 2644c39..9282162 100644 --- a/net/base/cert_verifier.cc +++ b/net/base/cert_verifier.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/synchronization/lock.h" #include "base/threading/worker_pool.h" #include "net/base/net_errors.h" diff --git a/net/base/crl_filter.cc b/net/base/crl_filter.cc index fe9d336..d438cc7 100644 --- a/net/base/crl_filter.cc +++ b/net/base/crl_filter.cc @@ -5,7 +5,7 @@ #include "base/base64.h" #include "base/json/json_reader.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/values.h" #include "crypto/sha2.h" #include "net/base/crl_filter.h" diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc index 81f9111..2cfb0cf 100644 --- a/net/base/dnsrr_resolver.cc +++ b/net/base/dnsrr_resolver.cc @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "base/task.h" diff --git a/net/base/host_cache_unittest.cc b/net/base/host_cache_unittest.cc index e534695..4c99688 100644 --- a/net/base/host_cache_unittest.cc +++ b/net/base/host_cache_unittest.cc @@ -5,7 +5,7 @@ #include "net/base/host_cache.h" #include "base/format_macros.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "net/base/net_errors.h" diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 4898d9e..4c367a1 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -21,7 +21,7 @@ #include "base/message_loop_proxy.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/task.h" #include "base/threading/worker_pool.h" diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 25c0633..097da23 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -45,7 +45,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.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_piece.h" #include "base/string_split.h" diff --git a/net/base/test_root_certs_nss.cc b/net/base/test_root_certs_nss.cc index 70c8133..3783265 100644 --- a/net/base/test_root_certs_nss.cc +++ b/net/base/test_root_certs_nss.cc @@ -7,7 +7,7 @@ #include <cert.h> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/nss_util.h" #include "net/base/x509_certificate.h" diff --git a/net/ftp/ftp_directory_listing_parser.cc b/net/ftp/ftp_directory_listing_parser.cc index dbb12ce..605abb8 100644 --- a/net/ftp/ftp_directory_listing_parser.cc +++ b/net/ftp/ftp_directory_listing_parser.cc @@ -6,7 +6,7 @@ #include "base/i18n/icu_encoding_detection.h" #include "base/i18n/icu_string_conversions.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_split.h" #include "base/string_util.h" #include "net/base/net_errors.h" diff --git a/net/http/http_alternate_protocols.cc b/net/http/http_alternate_protocols.cc index 28c52dc..42a6a9f 100644 --- a/net/http/http_alternate_protocols.cc +++ b/net/http/http_alternate_protocols.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/stringprintf.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace net { diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc index 8cf7d3e..88916f9 100644 --- a/net/http/http_auth_handler_factory.cc +++ b/net/http/http_auth_handler_factory.cc @@ -4,7 +4,7 @@ #include "net/http/http_auth_handler_factory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "net/base/net_errors.h" #include "net/http/http_auth_filter.h" diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index cf533e8..157059df 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -17,7 +17,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/pickle.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/stringprintf.h" diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index 27d5cb9..9f738ec 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -8,7 +8,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/values.h" #include "net/http/http_auth_handler_factory.h" diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index d856d02..7a10a1b 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -13,7 +13,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.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/stringprintf.h" diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc index 63db456..dacc2fb 100644 --- a/net/http/http_stream_factory_impl.cc +++ b/net/http/http_stream_factory_impl.cc @@ -5,7 +5,7 @@ #include "net/http/http_stream_factory_impl.h" #include "base/string_number_conversions.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "googleurl/src/gurl.h" #include "net/base/net_log.h" #include "net/base/net_util.h" diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index 8952668..417857b 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -5,7 +5,7 @@ #include "net/http/http_stream_factory_impl_job.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/values.h" diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc index d8bb09f..a97f46e 100644 --- a/net/http/http_stream_factory_impl_request.cc +++ b/net/http/http_stream_factory_impl_request.cc @@ -5,7 +5,7 @@ #include "net/http/http_stream_factory_impl_request.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "net/http/http_stream_factory_impl_job.h" #include "net/spdy/spdy_http_stream.h" #include "net/spdy/spdy_session.h" diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 80e5413..ec24107 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -20,7 +20,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_util.h" #include "base/stringprintf.h" #include "base/synchronization/condition_variable.h" diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index 8d2907c..2362ba4 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -5,7 +5,7 @@ #include "net/proxy/multi_threaded_proxy_resolver.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index df5109e..4674e25 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -4,7 +4,7 @@ #include "net/proxy/proxy_bypass_rules.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_tokenizer.h" diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 0334723..d57088d 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_tokenizer.h" #include "base/string_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread_restrictions.h" #include "base/win/registry.h" #include "net/base/net_errors.h" diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index d39890b..24966c0 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.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/time.h" diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h index 27e6f03..5bf61e4 100644 --- a/net/socket/client_socket_pool_manager.h +++ b/net/socket/client_socket_pool_manager.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/template_util.h" #include "base/threading/non_thread_safe.h" #include "net/base/cert_database.h" diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc index ecdf8cf..a1a2396 100644 --- a/net/socket/ssl_client_socket_win.cc +++ b/net/socket/ssl_client_socket_win.cc @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 36288c7..a1e8afe 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/stats_counters.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/stringprintf.h" diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc index 9df38f6..bae3a87 100644 --- a/net/udp/udp_socket_unittest.cc +++ b/net/udp/udp_socket_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/metrics/histogram.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" diff --git a/net/url_request/url_request_job_factory.cc b/net/url_request/url_request_job_factory.cc index 8ef5876..f5ff25d 100644 --- a/net/url_request/url_request_job_factory.cc +++ b/net/url_request/url_request_job_factory.cc @@ -4,7 +4,7 @@ #include "net/url_request/url_request_job_factory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_job_manager.h" diff --git a/printing/page_range.cc b/printing/page_range.cc index ffe572d..057ba3c 100644 --- a/printing/page_range.cc +++ b/printing/page_range.cc @@ -4,7 +4,8 @@ #include "printing/page_range.h" -#include "base/stl_util-inl.h" +#include <set> +#include <vector> namespace printing { @@ -18,7 +19,7 @@ std::vector<int> PageRange::GetPages(const PageRanges& ranges) { pages.insert(i); } } - return SetToVector(pages); + return std::vector<int>(pages.begin(), pages.end()); } /* static */ diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc index a48b582..677db3a 100644 --- a/remoting/base/tracer.cc +++ b/remoting/base/tracer.cc @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/synchronization/condition_variable.h" #include "base/threading/thread.h" #include "base/threading/platform_thread.h" diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index 7533b5f..adeb1a1 100644 --- a/remoting/host/screen_recorder.cc +++ b/remoting/host/screen_recorder.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/task.h" #include "base/time.h" #include "remoting/base/capture_data.h" diff --git a/remoting/jingle_glue/fake_signal_strategy.cc b/remoting/jingle_glue/fake_signal_strategy.cc index be7c14b..be95819 100644 --- a/remoting/jingle_glue/fake_signal_strategy.cc +++ b/remoting/jingle_glue/fake_signal_strategy.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" #include "third_party/libjingle/source/talk/xmpp/constants.h" diff --git a/remoting/protocol/buffered_socket_writer.cc b/remoting/protocol/buffered_socket_writer.cc index 4da41d7..415d09e 100644 --- a/remoting/protocol/buffered_socket_writer.cc +++ b/remoting/protocol/buffered_socket_writer.cc @@ -5,7 +5,7 @@ #include "remoting/protocol/buffered_socket_writer.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "net/base/net_errors.h" namespace remoting { diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index 7c05d2b..2d88ecd 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/hmac.h" #include "crypto/rsa_private_key.h" #include "net/base/net_errors.h" diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc index 38526b8..27a40ad 100644 --- a/remoting/protocol/message_decoder_unittest.cc +++ b/remoting/protocol/message_decoder_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_number_conversions.h" #include "remoting/proto/event.pb.h" #include "remoting/proto/internal.pb.h" diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index bada69b7..867448a 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/shared_memory.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 207584a..f6e4b2c 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/memory/scoped_handle.h" #include "base/pickle.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_hglobal.h" #include "googleurl/src/gurl.h" diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index 1ffd36f..dda3efe 100644 --- a/ui/base/l10n/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -13,7 +13,7 @@ #include "base/file_util.h" #include "base/i18n/case_conversion.h" #include "base/path_service.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 04a2cf3..8322566 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -5,7 +5,7 @@ #include "ui/base/resource/resource_bundle.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "build/build_config.h" diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index 1ad356c..d23a5b1 100644 --- a/ui/base/resource/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc index 5f24adc..d5cbaad 100644 --- a/ui/base/resource/resource_bundle_win.cc +++ b/ui/base/resource/resource_bundle_win.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/resource_util.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "base/win/windows_version.h" diff --git a/ui/gfx/compositor/compositor_win.cc b/ui/gfx/compositor/compositor_win.cc index 7518108..9a9666c 100644 --- a/ui/gfx/compositor/compositor_win.cc +++ b/ui/gfx/compositor/compositor_win.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_piece.h" #include "base/win/scoped_comptr.h" #include "grit/gfx_resources.h" diff --git a/ui/gfx/compositor/layer_animator.cc b/ui/gfx/compositor/layer_animator.cc index 49b4440..6144081 100644 --- a/ui/gfx/compositor/layer_animator.cc +++ b/ui/gfx/compositor/layer_animator.cc @@ -5,7 +5,7 @@ #include "ui/gfx/compositor/layer_animator.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "ui/base/animation/animation_container.h" #include "ui/base/animation/multi_animation.h" #include "ui/gfx/compositor/compositor.h" diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 4d87944..9bd6842 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "third_party/skia/include/core/SkBitmap.h" #if defined(TOOLKIT_USES_GTK) diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index 9103652..e8f0026 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -5,7 +5,7 @@ #include "views/controls/menu/menu_item_view.h" #include "base/i18n/case_conversion.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "grit/ui_strings.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index c4b6635..5c1d487 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -7,7 +7,7 @@ #include <string> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index cea1aba..8a20381 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "base/win/wrapped_window_proc.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 37b24d1..7eb01c2 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index 5499051..27b61e2 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -7,7 +7,7 @@ #include <vssym32.h> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" diff --git a/views/controls/textfield/textfield_views_model.cc b/views/controls/textfield/textfield_views_model.cc index 4027705..1605546 100644 --- a/views/controls/textfield/textfield_views_model.cc +++ b/views/controls/textfield/textfield_views_model.cc @@ -8,7 +8,7 @@ #include "base/i18n/break_iterator.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/utf_string_conversions.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 5a02376..22b2e5f 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -8,7 +8,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/win/win_util.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/views/focus/view_storage.cc b/views/focus/view_storage.cc index 053eb71b..17d3f8e 100644 --- a/views/focus/view_storage.cc +++ b/views/focus/view_storage.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" namespace views { diff --git a/views/layout/grid_layout.cc b/views/layout/grid_layout.cc index bedbd79..55a50ceb 100644 --- a/views/layout/grid_layout.cc +++ b/views/layout/grid_layout.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "ui/gfx/insets.h" #include "views/layout/layout_constants.h" #include "views/view.h" diff --git a/webkit/appcache/appcache_backend_impl.cc b/webkit/appcache/appcache_backend_impl.cc index cbe557b..44b3c47 100644 --- a/webkit/appcache/appcache_backend_impl.cc +++ b/webkit/appcache/appcache_backend_impl.cc @@ -4,7 +4,7 @@ #include "webkit/appcache/appcache_backend_impl.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "webkit/appcache/appcache.h" #include "webkit/appcache/appcache_group.h" #include "webkit/appcache/appcache_service.h" diff --git a/webkit/appcache/appcache_service.cc b/webkit/appcache/appcache_service.cc index bc0f4cc..1287c97 100644 --- a/webkit/appcache/appcache_service.cc +++ b/webkit/appcache/appcache_service.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "webkit/appcache/appcache_backend_impl.h" #include "webkit/appcache/appcache_entry.h" #include "webkit/appcache/appcache_quota_client.h" diff --git a/webkit/appcache/appcache_storage.cc b/webkit/appcache/appcache_storage.cc index a4fde29..47e64db 100644 --- a/webkit/appcache/appcache_storage.cc +++ b/webkit/appcache/appcache_storage.cc @@ -4,7 +4,7 @@ #include "webkit/appcache/appcache_storage.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "webkit/appcache/appcache_response.h" #include "webkit/appcache/appcache_service.h" #include "webkit/quota/quota_client.h" diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc index 6429e35..9de5cbd 100644 --- a/webkit/appcache/appcache_storage_impl.cc +++ b/webkit/appcache/appcache_storage_impl.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "net/base/cache_type.h" #include "net/base/net_errors.h" diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index f361994..44f347d 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -4,7 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/threading/thread.h" #include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" diff --git a/webkit/appcache/mock_appcache_storage.cc b/webkit/appcache/mock_appcache_storage.cc index 43fcd6b..8516403 100644 --- a/webkit/appcache/mock_appcache_storage.cc +++ b/webkit/appcache/mock_appcache_storage.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "webkit/appcache/appcache.h" #include "webkit/appcache/appcache_entry.h" #include "webkit/appcache/appcache_group.h" diff --git a/webkit/fileapi/obfuscated_file_system_file_util.cc b/webkit/fileapi/obfuscated_file_system_file_util.cc index 1f2ccfd..1ab2922 100644 --- a/webkit/fileapi/obfuscated_file_system_file_util.cc +++ b/webkit/fileapi/obfuscated_file_system_file_util.cc @@ -14,7 +14,7 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "googleurl/src/gurl.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation_context.h" diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc index 3927737..0ba4468 100644 --- a/webkit/quota/mock_storage_client.cc +++ b/webkit/quota/mock_storage_client.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop_proxy.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "net/base/net_util.h" #include "webkit/quota/quota_manager.h" diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index 7c38233f..e1b0ce1 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.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/sys_info.h" #include "base/time.h" diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc index e804f2f..df1aba7 100644 --- a/webkit/quota/quota_manager_unittest.cc +++ b/webkit/quota/quota_manager_unittest.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/scoped_temp_dir.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/sys_info.h" #include "base/time.h" #include "googleurl/src/gurl.h" diff --git a/webkit/quota/quota_types.h b/webkit/quota/quota_types.h index ce5b4e2..ec6ab45 100644 --- a/webkit/quota/quota_types.h +++ b/webkit/quota/quota_types.h @@ -8,11 +8,12 @@ #include <deque> #include <map> +#include <set> #include <string> #include "base/basictypes.h" #include "base/callback_old.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" class GURL; diff --git a/webkit/quota/usage_tracker.cc b/webkit/quota/usage_tracker.cc index ff08e19..309502b 100644 --- a/webkit/quota/usage_tracker.cc +++ b/webkit/quota/usage_tracker.cc @@ -9,7 +9,7 @@ #include <string> #include "base/message_loop_proxy.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "net/base/net_util.h" #include "webkit/quota/special_storage_policy.h" diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc index 1d68c6f..68e36cfd 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.cc +++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc @@ -5,7 +5,7 @@ #include "webkit/tools/test_shell/mock_webclipboard_impl.h" #include "base/logging.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string_util.h" #include "net/base/escape.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCommon.h" diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc index 77910d0..4cac61b 100644 --- a/webkit/tools/test_shell/simple_clipboard_impl.cc +++ b/webkit/tools/test_shell/simple_clipboard_impl.cc @@ -7,7 +7,7 @@ #include <string> #include "base/lazy_instance.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "base/string16.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" |