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 /media/base | |
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 'media/base')
-rw-r--r-- | media/base/simd/convert_rgb_to_yuv_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/test_data_util.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/base/simd/convert_rgb_to_yuv_unittest.cc b/media/base/simd/convert_rgb_to_yuv_unittest.cc index b1d7f9b..a1eab03 100644 --- a/media/base/simd/convert_rgb_to_yuv_unittest.cc +++ b/media/base/simd/convert_rgb_to_yuv_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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/cpu_features.h" #include "media/base/simd/convert_rgb_to_yuv.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h index f57b39d..19f8e7f 100644 --- a/media/base/test_data_util.h +++ b/media/base/test_data_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "media/base/data_buffer.h" namespace media { |