summaryrefslogtreecommitdiffstats
path: root/content/browser/background_sync
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-06-05 12:53:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-05 19:53:37 +0000
commit95082a6a47108c4e20a77cc224172a293065ab05 (patch)
treec34e72f82cf4742097c92a500fabd9af0f251cef /content/browser/background_sync
parent4e95f763c7f52664c94373b7d9fcc0ed96c7f019 (diff)
downloadchromium_src-95082a6a47108c4e20a77cc224172a293065ab05.zip
chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.gz
chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.bz2
content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs
This patch was mostly autogenerated with https://codereview.chromium.org/1010073002/. BUG=465354 TBR=nick@chromium.org Committed: https://crrev.com/422456f9d53f0bf936a64f21a1463fd0abd3df84 Cr-Commit-Position: refs/heads/master@{#333081} Review URL: https://codereview.chromium.org/1159623009 Cr-Commit-Position: refs/heads/master@{#333112}
Diffstat (limited to 'content/browser/background_sync')
-rw-r--r--content/browser/background_sync/background_sync_manager.cc81
-rw-r--r--content/browser/background_sync/background_sync_manager_unittest.cc6
-rw-r--r--content/browser/background_sync/background_sync_network_observer.cc6
3 files changed, 57 insertions, 36 deletions
diff --git a/content/browser/background_sync/background_sync_manager.cc b/content/browser/background_sync/background_sync_manager.cc
index c7c78cb..b82103d 100644
--- a/content/browser/background_sync/background_sync_manager.cc
+++ b/content/browser/background_sync/background_sync_manager.cc
@@ -6,6 +6,9 @@
#include "base/barrier_closure.h"
#include "base/bind.h"
+#include "base/location.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
#include "content/browser/background_sync/background_sync_network_observer.h"
#include "content/browser/background_sync/background_sync_power_observer.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ -75,7 +78,7 @@ void BackgroundSyncManager::Register(
sync_registration.id);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -96,7 +99,7 @@ void BackgroundSyncManager::Unregister(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -117,7 +120,7 @@ void BackgroundSyncManager::GetRegistration(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -138,7 +141,7 @@ void BackgroundSyncManager::GetRegistrations(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE,
std::vector<BackgroundSyncRegistration>()));
return;
@@ -203,7 +206,8 @@ void BackgroundSyncManager::InitImpl(const base::Closure& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -276,7 +280,8 @@ void BackgroundSyncManager::InitDidGetDataFromBackend(
FireReadyEvents();
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
}
void BackgroundSyncManager::RegisterImpl(
@@ -286,7 +291,7 @@ void BackgroundSyncManager::RegisterImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -296,7 +301,7 @@ void BackgroundSyncManager::RegisterImpl(
sw_registration_id, RegistrationKey(sync_registration));
if (existing_registration &&
existing_registration->Equals(sync_registration)) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, *existing_registration));
return;
}
@@ -309,7 +314,7 @@ void BackgroundSyncManager::RegisterImpl(
ServiceWorkerRegistration* sw_registration =
service_worker_context_->GetLiveRegistration(sw_registration_id);
if (!sw_registration || !sw_registration->active_version()) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NO_SERVICE_WORKER,
BackgroundSyncRegistration()));
return;
@@ -331,7 +336,8 @@ void BackgroundSyncManager::DisableAndClearManager(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -354,7 +360,8 @@ void BackgroundSyncManager::DisableAndClearDidGetRegistrations(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (status != SERVICE_WORKER_OK || user_data.empty()) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -375,8 +382,8 @@ void BackgroundSyncManager::DisableAndClearManagerClearedOne(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
// The status doesn't matter at this point, there is nothing else to be done.
- base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(barrier_closure));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(barrier_closure));
}
BackgroundSyncManager::BackgroundSyncRegistration*
@@ -445,7 +452,7 @@ void BackgroundSyncManager::RegisterDidStore(
if (status == SERVICE_WORKER_ERROR_NOT_FOUND) {
// The registration is gone.
sw_to_registrations_map_.erase(sw_registration_id);
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -460,7 +467,7 @@ void BackgroundSyncManager::RegisterDidStore(
}
FireReadyEvents();
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, new_registration));
}
@@ -530,7 +537,7 @@ void BackgroundSyncManager::UnregisterImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -539,7 +546,7 @@ void BackgroundSyncManager::UnregisterImpl(
LookupRegistration(sw_registration_id, registration_key);
if (!existing_registration ||
existing_registration->id != sync_registration_id) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NOT_FOUND));
return;
}
@@ -561,7 +568,7 @@ void BackgroundSyncManager::UnregisterDidStore(
if (status == SERVICE_WORKER_ERROR_NOT_FOUND) {
// ServiceWorker was unregistered.
sw_to_registrations_map_.erase(sw_registration_id);
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -572,8 +579,8 @@ void BackgroundSyncManager::UnregisterDidStore(
return;
}
- base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(callback, ERROR_TYPE_OK));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(callback, ERROR_TYPE_OK));
}
void BackgroundSyncManager::GetRegistrationImpl(
@@ -583,7 +590,7 @@ void BackgroundSyncManager::GetRegistrationImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -592,13 +599,13 @@ void BackgroundSyncManager::GetRegistrationImpl(
const BackgroundSyncRegistration* out_registration =
LookupRegistration(sw_registration_id, registration_key);
if (!out_registration) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NOT_FOUND,
BackgroundSyncRegistration()));
return;
}
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, *out_registration));
}
@@ -611,7 +618,7 @@ void BackgroundSyncManager::GetRegistrationsImpl(
std::vector<BackgroundSyncRegistration> out_registrations;
if (disabled_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE, out_registrations));
return;
}
@@ -629,7 +636,7 @@ void BackgroundSyncManager::GetRegistrationsImpl(
}
}
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, out_registrations));
}
@@ -696,7 +703,8 @@ void BackgroundSyncManager::FireReadyEventsImpl(const base::Closure& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -749,7 +757,8 @@ void BackgroundSyncManager::FireReadyEventsDidFindRegistration(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (service_worker_status != SERVICE_WORKER_OK) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -760,7 +769,8 @@ void BackgroundSyncManager::FireReadyEventsDidFindRegistration(
service_worker_registration->id(), registration_key,
registration_id));
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
}
// |service_worker_registration| is just to keep the registration alive
@@ -791,14 +801,16 @@ void BackgroundSyncManager::EventCompleteImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
BackgroundSyncRegistration* registration =
LookupRegistration(service_worker_id, key);
if (!registration || registration->id != sync_registration_id) {
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -831,7 +843,8 @@ void BackgroundSyncManager::EventCompleteDidStore(
if (status_code == SERVICE_WORKER_ERROR_NOT_FOUND) {
// The registration is gone.
sw_to_registrations_map_.erase(service_worker_id);
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
return;
}
@@ -842,7 +855,8 @@ void BackgroundSyncManager::EventCompleteDidStore(
return;
}
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
}
void BackgroundSyncManager::OnRegistrationDeletedImpl(
@@ -853,7 +867,8 @@ void BackgroundSyncManager::OnRegistrationDeletedImpl(
// The backend (ServiceWorkerStorage) will delete the data, so just delete the
// memory representation here.
sw_to_registrations_map_.erase(registration_id);
- base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback));
}
void BackgroundSyncManager::OnStorageWipedImpl(const base::Closure& callback) {
diff --git a/content/browser/background_sync/background_sync_manager_unittest.cc b/content/browser/background_sync/background_sync_manager_unittest.cc
index cb60eee..f49db2d 100644
--- a/content/browser/background_sync/background_sync_manager_unittest.cc
+++ b/content/browser/background_sync/background_sync_manager_unittest.cc
@@ -5,10 +5,12 @@
#include "content/browser/background_sync/background_sync_manager.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/location.h"
#include "base/logging.h"
#include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_monitor_source.h"
#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "content/browser/browser_thread_impl.h"
#include "content/browser/service_worker/embedded_worker_test_helper.h"
@@ -145,7 +147,7 @@ class TestBackgroundSyncManager : public BackgroundSyncManager {
const ServiceWorkerStorage::StatusCallback& callback) override {
EXPECT_TRUE(continuation_.is_null());
if (corrupt_backend_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, SERVICE_WORKER_ERROR_FAILED));
return;
}
@@ -165,7 +167,7 @@ class TestBackgroundSyncManager : public BackgroundSyncManager {
callback) override {
EXPECT_TRUE(continuation_.is_null());
if (corrupt_backend_) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, std::vector<std::pair<int64, std::string>>(),
SERVICE_WORKER_ERROR_FAILED));
diff --git a/content/browser/background_sync/background_sync_network_observer.cc b/content/browser/background_sync/background_sync_network_observer.cc
index fafb1e6..1c6f2bd 100644
--- a/content/browser/background_sync/background_sync_network_observer.cc
+++ b/content/browser/background_sync/background_sync_network_observer.cc
@@ -4,6 +4,9 @@
#include "content/browser/background_sync/background_sync_network_observer.h"
+#include "base/location.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
#include "content/public/browser/browser_thread.h"
namespace content {
@@ -47,7 +50,8 @@ bool BackgroundSyncNetworkObserver::NetworkSufficient(
void BackgroundSyncNetworkObserver::NotifyNetworkChanged() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- base::MessageLoop::current()->PostTask(FROM_HERE, network_changed_callback_);
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ network_changed_callback_);
}
void BackgroundSyncNetworkObserver::OnNetworkChanged(