diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 02:09:02 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 02:09:02 +0000 |
| commit | be6054a4b00eedc0dfb6fe29d464217755a24d77 (patch) | |
| tree | 0dbd96ca17b527640bb6ba58b28af7cfc7f2799b | |
| parent | 0cbe08191097abcb7a161570e71b584bdef6b52a (diff) | |
| download | chromium_src-be6054a4b00eedc0dfb6fe29d464217755a24d77.zip chromium_src-be6054a4b00eedc0dfb6fe29d464217755a24d77.tar.gz chromium_src-be6054a4b00eedc0dfb6fe29d464217755a24d77.tar.bz2 | |
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 3)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7111046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89958 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 4 insertions, 5 deletions
diff --git a/third_party/libphonenumber/chrome/regexp_adapter_icuregexp.cc b/third_party/libphonenumber/chrome/regexp_adapter_icuregexp.cc index d4972ce..d3cf720 100644 --- a/third_party/libphonenumber/chrome/regexp_adapter_icuregexp.cc +++ b/third_party/libphonenumber/chrome/regexp_adapter_icuregexp.cc @@ -8,8 +8,8 @@ // Setup all of the Chromium and WebKit defines #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/scoped_ptr.h" #include "build/build_config.h" #include "unicode/regex.h" #include "unicode/stringpiece.h" diff --git a/third_party/libphonenumber/cpp/src/phonenumberutil.h b/third_party/libphonenumber/cpp/src/phonenumberutil.h index 43137a0..ef26abb 100644 --- a/third_party/libphonenumber/cpp/src/phonenumberutil.h +++ b/third_party/libphonenumber/cpp/src/phonenumberutil.h @@ -28,7 +28,7 @@ #include <vector> #include <unicode/translit.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/singleton.h" #include "phonenumber.pb.h" diff --git a/third_party/libphonenumber/cpp/src/re2_cache.h b/third_party/libphonenumber/cpp/src/re2_cache.h index ab2e9bb..a9fec39 100644 --- a/third_party/libphonenumber/cpp/src/re2_cache.h +++ b/third_party/libphonenumber/cpp/src/re2_cache.h @@ -38,7 +38,7 @@ #include <hash_map> #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" namespace re2 { diff --git a/third_party/libphonenumber/cpp/src/regexp_adapter_unittest.cc b/third_party/libphonenumber/cpp/src/regexp_adapter_unittest.cc index 446f83c..9379552 100644 --- a/third_party/libphonenumber/cpp/src/regexp_adapter_unittest.cc +++ b/third_party/libphonenumber/cpp/src/regexp_adapter_unittest.cc @@ -15,7 +15,7 @@ // Author: George Yakovlev #include <gtest/gtest.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "regexp_adapter.h" namespace reg_exp { @@ -139,4 +139,3 @@ TEST(RegExpAdapter, TestUtf8) { } } // namespace reg_exp - |