Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/background_sync/background_sync_manager.cc

Issue 1170623003: Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/appcache/mock_appcache_storage.cc ('k') | content/browser/background_sync/background_sync_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/background_sync/background_sync_manager.cc
diff --git a/content/browser/background_sync/background_sync_manager.cc b/content/browser/background_sync/background_sync_manager.cc
index b82103d59b7ce4ef04d1f6c511c8c77ee890bf0c..c7c78cb0b259dd2642b1f847b77c818ddfff31fd 100644
--- a/content/browser/background_sync/background_sync_manager.cc
+++ b/content/browser/background_sync/background_sync_manager.cc
@@ -6,9 +6,6 @@
#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"
@@ -78,7 +75,7 @@ void BackgroundSyncManager::Register(
sync_registration.id);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -99,7 +96,7 @@ void BackgroundSyncManager::Unregister(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -120,7 +117,7 @@ void BackgroundSyncManager::GetRegistration(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -141,7 +138,7 @@ void BackgroundSyncManager::GetRegistrations(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE,
std::vector<BackgroundSyncRegistration>()));
return;
@@ -206,8 +203,7 @@ void BackgroundSyncManager::InitImpl(const base::Closure& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -280,8 +276,7 @@ void BackgroundSyncManager::InitDidGetDataFromBackend(
FireReadyEvents();
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
}
void BackgroundSyncManager::RegisterImpl(
@@ -291,7 +286,7 @@ void BackgroundSyncManager::RegisterImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -301,7 +296,7 @@ void BackgroundSyncManager::RegisterImpl(
sw_registration_id, RegistrationKey(sync_registration));
if (existing_registration &&
existing_registration->Equals(sync_registration)) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, *existing_registration));
return;
}
@@ -314,7 +309,7 @@ void BackgroundSyncManager::RegisterImpl(
ServiceWorkerRegistration* sw_registration =
service_worker_context_->GetLiveRegistration(sw_registration_id);
if (!sw_registration || !sw_registration->active_version()) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NO_SERVICE_WORKER,
BackgroundSyncRegistration()));
return;
@@ -336,8 +331,7 @@ void BackgroundSyncManager::DisableAndClearManager(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -360,8 +354,7 @@ void BackgroundSyncManager::DisableAndClearDidGetRegistrations(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (status != SERVICE_WORKER_OK || user_data.empty()) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -382,8 +375,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::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(barrier_closure));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(barrier_closure));
}
BackgroundSyncManager::BackgroundSyncRegistration*
@@ -452,7 +445,7 @@ void BackgroundSyncManager::RegisterDidStore(
if (status == SERVICE_WORKER_ERROR_NOT_FOUND) {
// The registration is gone.
sw_to_registrations_map_.erase(sw_registration_id);
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -467,7 +460,7 @@ void BackgroundSyncManager::RegisterDidStore(
}
FireReadyEvents();
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, new_registration));
}
@@ -537,7 +530,7 @@ void BackgroundSyncManager::UnregisterImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -546,7 +539,7 @@ void BackgroundSyncManager::UnregisterImpl(
LookupRegistration(sw_registration_id, registration_key);
if (!existing_registration ||
existing_registration->id != sync_registration_id) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NOT_FOUND));
return;
}
@@ -568,7 +561,7 @@ void BackgroundSyncManager::UnregisterDidStore(
if (status == SERVICE_WORKER_ERROR_NOT_FOUND) {
// ServiceWorker was unregistered.
sw_to_registrations_map_.erase(sw_registration_id);
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE));
return;
}
@@ -579,8 +572,8 @@ void BackgroundSyncManager::UnregisterDidStore(
return;
}
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(callback, ERROR_TYPE_OK));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, ERROR_TYPE_OK));
}
void BackgroundSyncManager::GetRegistrationImpl(
@@ -590,7 +583,7 @@ void BackgroundSyncManager::GetRegistrationImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, ERROR_TYPE_STORAGE, BackgroundSyncRegistration()));
return;
@@ -599,13 +592,13 @@ void BackgroundSyncManager::GetRegistrationImpl(
const BackgroundSyncRegistration* out_registration =
LookupRegistration(sw_registration_id, registration_key);
if (!out_registration) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_NOT_FOUND,
BackgroundSyncRegistration()));
return;
}
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, *out_registration));
}
@@ -618,7 +611,7 @@ void BackgroundSyncManager::GetRegistrationsImpl(
std::vector<BackgroundSyncRegistration> out_registrations;
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_STORAGE, out_registrations));
return;
}
@@ -636,7 +629,7 @@ void BackgroundSyncManager::GetRegistrationsImpl(
}
}
- base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERROR_TYPE_OK, out_registrations));
}
@@ -703,8 +696,7 @@ void BackgroundSyncManager::FireReadyEventsImpl(const base::Closure& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -757,8 +749,7 @@ void BackgroundSyncManager::FireReadyEventsDidFindRegistration(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (service_worker_status != SERVICE_WORKER_OK) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -769,8 +760,7 @@ void BackgroundSyncManager::FireReadyEventsDidFindRegistration(
service_worker_registration->id(), registration_key,
registration_id));
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
}
// |service_worker_registration| is just to keep the registration alive
@@ -801,16 +791,14 @@ void BackgroundSyncManager::EventCompleteImpl(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (disabled_) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
BackgroundSyncRegistration* registration =
LookupRegistration(service_worker_id, key);
if (!registration || registration->id != sync_registration_id) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -843,8 +831,7 @@ void BackgroundSyncManager::EventCompleteDidStore(
if (status_code == SERVICE_WORKER_ERROR_NOT_FOUND) {
// The registration is gone.
sw_to_registrations_map_.erase(service_worker_id);
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
return;
}
@@ -855,8 +842,7 @@ void BackgroundSyncManager::EventCompleteDidStore(
return;
}
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
}
void BackgroundSyncManager::OnRegistrationDeletedImpl(
@@ -867,8 +853,7 @@ 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::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- base::Bind(callback));
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback));
}
void BackgroundSyncManager::OnStorageWipedImpl(const base::Closure& callback) {
« no previous file with comments | « content/browser/appcache/mock_appcache_storage.cc ('k') | content/browser/background_sync/background_sync_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698