diff options
| author | skyostil <skyostil@chromium.org> | 2015-06-05 08:26:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 15:26:51 +0000 |
| commit | 74f13dc2b62abb34e947093fe2600f9c539e60ef (patch) | |
| tree | c298260fa8c56717943ff45efda601f312cc74c4 /content/browser/geolocation/geolocation_provider_impl_unittest.cc | |
| parent | a95af720637c609f33ed76d89d658041f354a222 (diff) | |
| download | chromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.zip chromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.tar.gz chromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.tar.bz2 | |
Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"
This reverts commit 5d18b2493af36d77d3c491854e3d56f46f5f747c.
Reason: Broke iOS build: http://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_%28dbg%29/builds/27843
NOTRY=true
NOTREECHECKS=true
BUG=465354
TBR=sievers@chromium.org,nick@chromium.org
Review URL: https://codereview.chromium.org/1153503009
Cr-Commit-Position: refs/heads/master@{#333047}
Diffstat (limited to 'content/browser/geolocation/geolocation_provider_impl_unittest.cc')
| -rw-r--r-- | content/browser/geolocation/geolocation_provider_impl_unittest.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/content/browser/geolocation/geolocation_provider_impl_unittest.cc b/content/browser/geolocation/geolocation_provider_impl_unittest.cc index 3ba4dae..685818b 100644 --- a/content/browser/geolocation/geolocation_provider_impl_unittest.cc +++ b/content/browser/geolocation/geolocation_provider_impl_unittest.cc @@ -4,10 +4,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/single_thread_task_runner.h" +#include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "content/browser/geolocation/geolocation_provider_impl.h" @@ -141,9 +140,11 @@ bool GeolocationProviderTest::ProvidersStarted() { DCHECK(provider_->IsRunning()); DCHECK(base::MessageLoop::current() == &message_loop_); bool started; - provider_->task_runner()->PostTaskAndReply( - FROM_HERE, base::Bind(&GeolocationProviderTest::GetProvidersStarted, - base::Unretained(this), &started), + provider_->message_loop_proxy()->PostTaskAndReply( + FROM_HERE, + base::Bind(&GeolocationProviderTest::GetProvidersStarted, + base::Unretained(this), + &started), base::MessageLoop::QuitClosure()); message_loop_.Run(); return started; @@ -157,9 +158,11 @@ void GeolocationProviderTest::GetProvidersStarted(bool* started) { void GeolocationProviderTest::SendMockLocation(const Geoposition& position) { DCHECK(provider_->IsRunning()); DCHECK(base::MessageLoop::current() == &message_loop_); - provider_->task_runner()->PostTask( - FROM_HERE, base::Bind(&GeolocationProviderImpl::OnLocationUpdate, - base::Unretained(provider_.get()), position)); + provider_->message_loop() + ->PostTask(FROM_HERE, + base::Bind(&GeolocationProviderImpl::OnLocationUpdate, + base::Unretained(provider_.get()), + position)); } // Regression test for http://crbug.com/59377 |