diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 04:14:23 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 04:14:23 +0000 |
| commit | e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b (patch) | |
| tree | 749e2cc0ae20a323b91d7162823bf8dd7e557fad /base | |
| parent | e10f6c8060762def59918d6ae2658065e6d4a406 (diff) | |
| download | chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.zip chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.tar.gz chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.tar.bz2 | |
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7149008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/message_loop.cc | 2 | ||||
| -rw-r--r-- | base/metrics/histogram_unittest.cc | 5 | ||||
| -rw-r--r-- | base/utf_offset_string_conversions.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index e6b49ac8..b0526f4 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -11,9 +11,9 @@ #include "base/debug/alias.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_pump_default.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/thread_local.h" #include "base/time.h" diff --git a/base/metrics/histogram_unittest.cc b/base/metrics/histogram_unittest.cc index 9d671df..5237f33 100644 --- a/base/metrics/histogram_unittest.cc +++ b/base/metrics/histogram_unittest.cc @@ -4,8 +4,11 @@ // Test of Histogram class +#include <algorithm> +#include <vector> + +#include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/utf_offset_string_conversions.cc b/base/utf_offset_string_conversions.cc index e5f8c81..26d28f5 100644 --- a/base/utf_offset_string_conversions.cc +++ b/base/utf_offset_string_conversions.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/utf_string_conversion_utils.h" |