summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 22:40:03 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 22:40:03 +0000
commitfb5af2366bf2001c357ca0a0fffca800531eef46 (patch)
tree71e8568c312810fbc091336ff22068da09057912 /webkit/media
parent06ff88b35ec9062666a08c53f74d1990d85c745b (diff)
downloadchromium_src-fb5af2366bf2001c357ca0a0fffca800531eef46.zip
chromium_src-fb5af2366bf2001c357ca0a0fffca800531eef46.tar.gz
chromium_src-fb5af2366bf2001c357ca0a0fffca800531eef46.tar.bz2
Use base::MessageLoop in media code.
MessageLoop is moved to base namespace in r191566. This CL is the followup cleanup in media code. The following folders are replaced: chrome/browser/media content/browser/renderer_host/media content/common/gpu/media content/common/media content/renderer/media media webkit/media The following command is used to make sure all instances in these folders are updated: grep -rin '[^a-zA-Z]MessageLoop[^a-zA-Z]' media chrome/browser/media content/browser/renderer_host/media content/common/gpu/media content/common/media content/renderer/media webkit/media | grep -v 'base::MessageLoop' | grep -v 'class MessageLoop' Review URL: https://chromiumcodereview.appspot.com/14385002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/android/webmediaplayer_android.cc2
-rw-r--r--webkit/media/android/webmediaplayer_android.h4
-rw-r--r--webkit/media/buffered_data_source_unittest.cc2
-rw-r--r--webkit/media/buffered_resource_loader_unittest.cc4
-rw-r--r--webkit/media/webmediaplayer_impl.cc6
-rw-r--r--webkit/media/webmediaplayer_impl.h2
6 files changed, 10 insertions, 10 deletions
diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc
index 3dfa9f8..09e784a 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/media/android/webmediaplayer_android.cc
@@ -37,7 +37,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
StreamTextureFactory* factory)
: client_(client),
buffered_(1u),
- main_loop_(MessageLoop::current()),
+ main_loop_(base::MessageLoop::current()),
pending_seek_(0),
seeking_(false),
did_loading_progress_(false),
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
index b0371d5..90f245b 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/media/android/webmediaplayer_android.h
@@ -33,7 +33,7 @@ class WebMediaPlayerManagerAndroid;
class WebMediaPlayerAndroid
: public WebKit::WebMediaPlayer,
public cc::VideoFrameProvider,
- public MessageLoop::DestructionObserver {
+ public base::MessageLoop::DestructionObserver {
public:
// Resource loading.
virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
@@ -227,7 +227,7 @@ class WebMediaPlayerAndroid
scoped_refptr<media::VideoFrame> current_frame_;
// Message loop for main renderer thread.
- MessageLoop* main_loop_;
+ base::MessageLoop* main_loop_;
// URL of the media file to be fetched.
GURL url_;
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index 92109fc..1a1d747f 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -214,7 +214,7 @@ class BufferedDataSourceTest : public testing::Test {
WebView* view_;
StrictMock<media::MockDataSourceHost> host_;
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
private:
// Used for calling BufferedDataSource::Read().
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index 9e9dbe1..f36896a 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -195,7 +195,7 @@ class BufferedResourceLoaderTest : public testing::Test {
loader_->willSendRequest(url_loader_, newRequest, redirectResponse);
- MessageLoop::current()->RunUntilIdle();
+ base::MessageLoop::current()->RunUntilIdle();
}
void StopWhenLoad() {
@@ -299,7 +299,7 @@ class BufferedResourceLoaderTest : public testing::Test {
MockWebFrameClient client_;
WebView* view_;
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
uint8 data_[kDataSize];
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 7917b66..3d5722f 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -175,7 +175,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
AsWeakPtr()));
// Also we want to be notified of |main_loop_| destruction.
- MessageLoop::current()->AddDestructionObserver(this);
+ base::MessageLoop::current()->AddDestructionObserver(this);
if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
decryptor_.reset(new ProxyDecryptor(
@@ -207,8 +207,8 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
// Remove destruction observer if we're being destroyed but the main thread is
// still running.
- if (MessageLoop::current())
- MessageLoop::current()->RemoveDestructionObserver(this);
+ if (base::MessageLoop::current())
+ base::MessageLoop::current()->RemoveDestructionObserver(this);
}
namespace {
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 6b7cd33..1144c71 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -72,7 +72,7 @@ class WebMediaPlayerParams;
class WebMediaPlayerImpl
: public WebKit::WebMediaPlayer,
public cc::VideoFrameProvider,
- public MessageLoop::DestructionObserver,
+ public base::MessageLoop::DestructionObserver,
public base::SupportsWeakPtr<WebMediaPlayerImpl> {
public:
// Constructs a WebMediaPlayer implementation using Chromium's media stack.