summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 20:25:42 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 20:25:42 +0000
commitbd9a7f3f5e13d43ea5d6d005de18ba6e5a0a23d0 (patch)
tree3851732e91a9c4eac5b027348f26590c9aa92055 /ash/test
parent9915675de3cdff155b82da08e8ed3729c57b55fc (diff)
downloadchromium_src-bd9a7f3f5e13d43ea5d6d005de18ba6e5a0a23d0.zip
chromium_src-bd9a7f3f5e13d43ea5d6d005de18ba6e5a0a23d0.tar.gz
chromium_src-bd9a7f3f5e13d43ea5d6d005de18ba6e5a0a23d0.tar.bz2
ash: Use base::MessageLoop.
BUG=236029 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/14283019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/launcher_view_test_api.cc4
-rw-r--r--ash/test/test_metro_viewer_process_host.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/test/launcher_view_test_api.cc b/ash/test/launcher_view_test_api.cc
index 1e1da4a..094ef89 100644
--- a/ash/test/launcher_view_test_api.cc
+++ b/ash/test/launcher_view_test_api.cc
@@ -24,7 +24,7 @@ class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
virtual void OnBoundsAnimatorProgressed(
views::BoundsAnimator* animator) OVERRIDE {}
virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE {
- MessageLoop::current()->Quit();
+ base::MessageLoop::current()->Quit();
}
private:
@@ -90,7 +90,7 @@ void LauncherViewTestAPI::RunMessageLoopUntilAnimationsDone() {
// This nested loop will quit when TestAPIAnimationObserver's
// OnBoundsAnimatorDone is called.
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
launcher_view_->bounds_animator_->RemoveObserver(observer.get());
}
diff --git a/ash/test/test_metro_viewer_process_host.cc b/ash/test/test_metro_viewer_process_host.cc
index 270c233..277864f 100644
--- a/ash/test/test_metro_viewer_process_host.cc
+++ b/ash/test/test_metro_viewer_process_host.cc
@@ -40,7 +40,7 @@ TestMetroViewerProcessHost::TestMetroViewerProcessHost(
closed_unexpectedly_(false) {
base::Thread::Options options;
- options.message_loop_type = MessageLoop::TYPE_IO;
+ options.message_loop_type = base::MessageLoop::TYPE_IO;
ipc_thread_.StartWithOptions(options);
channel_.reset(new IPC::ChannelProxy(