diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 20:59:06 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 20:59:06 +0000 |
| commit | 7f8f556408487205d27c3d192e13300418629397 (patch) | |
| tree | 2b2e8ce52f8f9e0ca973cc9a1e5f331e9223c6b2 /third_party | |
| parent | 1d0079155dc88b3793e36b01a5888fc58b0ce374 (diff) | |
| download | chromium_src-7f8f556408487205d27c3d192e13300418629397.zip chromium_src-7f8f556408487205d27c3d192e13300418629397.tar.gz chromium_src-7f8f556408487205d27c3d192e13300418629397.tar.bz2 | |
Remove base/scoped_ptr.h
Fix remaining users to use base/memory/scoped_ptr.h.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7930009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
6 files changed, 6 insertions, 6 deletions
diff --git a/third_party/libphonenumber/cpp/CMakeLists.txt b/third_party/libphonenumber/cpp/CMakeLists.txt index 1acf742..888c7c5 100644 --- a/third_party/libphonenumber/cpp/CMakeLists.txt +++ b/third_party/libphonenumber/cpp/CMakeLists.txt @@ -314,7 +314,7 @@ install (FILES install (FILES "src/base/basictypes.h" - "src/base/scoped_ptr.h" + "src/base/memory/scoped_ptr.h" "src/base/singleton.h" DESTINATION include/phonenumbers/base/ ) diff --git a/third_party/libphonenumber/cpp/src/logger.h b/third_party/libphonenumber/cpp/src/logger.h index db8951c..57b3ff5 100644 --- a/third_party/libphonenumber/cpp/src/logger.h +++ b/third_party/libphonenumber/cpp/src/logger.h @@ -20,7 +20,7 @@ #include <cstdio> #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace i18n { namespace phonenumbers { diff --git a/third_party/libphonenumber/cpp/src/phonenumberutil.h b/third_party/libphonenumber/cpp/src/phonenumberutil.h index 0112dc5..95035bc 100644 --- a/third_party/libphonenumber/cpp/src/phonenumberutil.h +++ b/third_party/libphonenumber/cpp/src/phonenumberutil.h @@ -28,7 +28,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "phonenumber.pb.h" diff --git a/third_party/libphonenumber/cpp/src/regexp_adapter_icu.cc b/third_party/libphonenumber/cpp/src/regexp_adapter_icu.cc index 933f455..cf07d63 100644 --- a/third_party/libphonenumber/cpp/src/regexp_adapter_icu.cc +++ b/third_party/libphonenumber/cpp/src/regexp_adapter_icu.cc @@ -24,7 +24,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "default_logger.h" namespace i18n { diff --git a/third_party/libphonenumber/cpp/src/regexp_adapter_test.cc b/third_party/libphonenumber/cpp/src/regexp_adapter_test.cc index a57ba383..bed7486 100644 --- a/third_party/libphonenumber/cpp/src/regexp_adapter_test.cc +++ b/third_party/libphonenumber/cpp/src/regexp_adapter_test.cc @@ -21,7 +21,7 @@ #include <gtest/gtest.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace i18n { namespace phonenumbers { diff --git a/third_party/libphonenumber/cpp/src/regexp_cache.h b/third_party/libphonenumber/cpp/src/regexp_cache.h index 5062452..13449d6 100644 --- a/third_party/libphonenumber/cpp/src/regexp_cache.h +++ b/third_party/libphonenumber/cpp/src/regexp_cache.h @@ -31,7 +31,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #ifdef USE_TR1_UNORDERED_MAP |