summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 08:44:22 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-18 08:44:22 +0000
commit7226b33cbb1b56189c9454364fbaa9ed339691f7 (patch)
tree77eef58a6ead14b642e80abb352c55688ee230d2 /media
parent87b576887a6339451a33c67e43361a18189a7e04 (diff)
downloadchromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.zip
chromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.tar.gz
chromium_src-7226b33cbb1b56189c9454364fbaa9ed339691f7.tar.bz2
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 4)
BUG=none TEST=none Review URL: http://codereview.chromium.org/7670016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/media_log.cc4
-rw-r--r--media/filters/chunk_demuxer_factory.h4
-rw-r--r--media/webm/cluster_builder.h2
-rw-r--r--media/webm/webm_cluster_parser.h9
4 files changed, 12 insertions, 7 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index 95b9e8b..e829d1f 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -4,9 +4,11 @@
#include "media/base/media_log.h"
+#include <string>
+
#include "base/atomic_sequence_num.h"
#include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/values.h"
namespace media {
diff --git a/media/filters/chunk_demuxer_factory.h b/media/filters/chunk_demuxer_factory.h
index a3d004a..b1124d5 100644
--- a/media/filters/chunk_demuxer_factory.h
+++ b/media/filters/chunk_demuxer_factory.h
@@ -5,7 +5,9 @@
#ifndef MEDIA_FILTERS_CHUNK_DEMUXER_FACTORY_H_
#define MEDIA_FILTERS_CHUNK_DEMUXER_FACTORY_H_
-#include "base/scoped_ptr.h"
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
#include "media/base/filter_factories.h"
namespace media {
diff --git a/media/webm/cluster_builder.h b/media/webm/cluster_builder.h
index aef9d8e..132da8a 100644
--- a/media/webm/cluster_builder.h
+++ b/media/webm/cluster_builder.h
@@ -6,7 +6,7 @@
#define MEDIA_WEBM_CLUSTER_BUILDER_H_
#include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "media/base/buffers.h"
namespace media {
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h
index 98c5854..0266086 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/webm/webm_cluster_parser.h
@@ -6,8 +6,9 @@
#define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
#include <deque>
+#include <string>
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "media/base/buffers.h"
#include "media/webm/webm_parser.h"
@@ -44,8 +45,8 @@ class WebMClusterParser : public WebMParserClient {
virtual bool OnSimpleBlock(int track_num, int timecode, int flags,
const uint8* data, int size);
- double timecode_multiplier_; // Multiplier used to convert timecodes into
- // microseconds.
+ double timecode_multiplier_; // Multiplier used to convert timecodes into
+ // microseconds.
int audio_track_num_;
base::TimeDelta audio_default_duration_;
int video_track_num_;
@@ -62,4 +63,4 @@ class WebMClusterParser : public WebMParserClient {
} // namespace media
-#endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
+#endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_