summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 07:12:06 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 07:12:06 +0000
commit5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca (patch)
treed9a816d80aad54c6ed8e317ec64b890c5506e3f7 /media/tools
parentabdeb5d2c34143de67dda6783b4552bfecbcda1e (diff)
downloadchromium_src-5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca.zip
chromium_src-5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca.tar.gz
chromium_src-5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca.tar.bz2
Cleanup: Remove unneeded scoped_ptr.h includes from ash, base, media, and ui.
BUG=none TEST=none TBR=ben,brettw,hclam Review URL: https://chromiumcodereview.appspot.com/10391121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/shader_bench/cpu_color_painter.h4
-rw-r--r--media/tools/shader_bench/gpu_color_painter.h2
-rw-r--r--media/tools/shader_bench/painter.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/media/tools/shader_bench/cpu_color_painter.h b/media/tools/shader_bench/cpu_color_painter.h
index b5531e1..7aba3cd 100644
--- a/media/tools/shader_bench/cpu_color_painter.h
+++ b/media/tools/shader_bench/cpu_color_painter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,7 +6,7 @@
#define MEDIA_TOOLS_SHADER_BENCH_CPU_COLOR_PAINTER_H_
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/video_frame.h"
#include "media/tools/shader_bench/gpu_painter.h"
diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h
index 5ca82bc..63c6f52 100644
--- a/media/tools/shader_bench/gpu_color_painter.h
+++ b/media/tools/shader_bench/gpu_color_painter.h
@@ -6,7 +6,7 @@
#define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/video_frame.h"
#include "media/tools/shader_bench/gpu_painter.h"
#include "ui/gl/gl_context.h"
diff --git a/media/tools/shader_bench/painter.h b/media/tools/shader_bench/painter.h
index 3af75da..2dd92ab 100644
--- a/media/tools/shader_bench/painter.h
+++ b/media/tools/shader_bench/painter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#include <deque>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/video_frame.h"
// Class that paints video frames to a window.