summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
commit34b9963c187a733bef76535521f3de688fffd34f (patch)
treea0569030e3a2ecc5b9c88d31a2469a380de85346 /media/audio
parent1a2a571b157327f75acd56bd594ef0863481dc32 (diff)
downloadchromium_src-34b9963c187a733bef76535521f3de688fffd34f.zip
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.gz
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.bz2
Move base/thread.h to base/threading, fix up callers to use the new location.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/audio_input_controller.cc2
-rw-r--r--media/audio/audio_input_controller.h2
-rw-r--r--media/audio/audio_manager_base.h2
-rw-r--r--media/audio/fake_audio_input_stream.h2
-rw-r--r--media/audio/linux/audio_manager_linux.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index 50fb39d..4f08c46 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -4,7 +4,7 @@
#include "media/audio/audio_input_controller.h"
-#include "base/thread_restrictions.h"
+#include "base/threading/thread_restrictions.h"
#include "media/base/limits.h"
namespace {
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index cfba450b3..8afb3bd 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -8,7 +8,7 @@
#include "base/lock.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager.h"
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 370a20c..51364b7 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "media/audio/audio_manager.h"
class AudioOutputDispatcher;
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 62ab504..b2bba35 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -11,7 +11,7 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "base/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index a5ba17cf..4ae3b64 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -10,7 +10,7 @@
#include "base/lock.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "media/audio/audio_manager_base.h"
class AlsaPcmOutputStream;