Snapshot of all changes to get jumbo in blink and content.

content/child/service_worker/service_worker_dispatcher.cc

Index: content/child/service_worker/service_worker_dispatcher.cc
diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc
index fc5372b1e594c5b7711d3d683694b933ad401899..2959a6705b6c76c02eb2c8e5ffaf66c77fbba421 100644
--- a/content/child/service_worker/service_worker_dispatcher.cc
+++ b/content/child/service_worker/service_worker_dispatcher.cc
@@ -42,9 +42,9 @@ namespace {
 base::LazyInstance<ThreadLocalPointer<void>>::Leaky g_dispatcher_tls =
     LAZY_INSTANCE_INITIALIZER;
 
-void* const kHasBeenDeleted = reinterpret_cast<void*>(0x1);
+void* const kSWDispatcherHasBeenDeleted = reinterpret_cast<void*>(0x1);
 
-int CurrentWorkerId() {
+int ServiceWorkerCurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
 
@@ -59,7 +59,7 @@ ServiceWorkerDispatcher::ServiceWorkerDispatcher(
 }
 
 ServiceWorkerDispatcher::~ServiceWorkerDispatcher() {
-  g_dispatcher_tls.Pointer()->Set(kHasBeenDeleted);
+  g_dispatcher_tls.Pointer()->Set(kSWDispatcherHasBeenDeleted);
 }
 
 void ServiceWorkerDispatcher::OnMessageReceived(const IPC::Message& msg) {
@@ -111,7 +111,7 @@ void ServiceWorkerDispatcher::UpdateServiceWorker(
   DCHECK(callbacks);
   int request_id = pending_update_callbacks_.Add(std::move(callbacks));
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_UpdateServiceWorker(
-      CurrentWorkerId(), request_id, provider_id, registration_id));
+      ServiceWorkerCurrentWorkerId(), request_id, provider_id, registration_id));
 }
 
 void ServiceWorkerDispatcher::UnregisterServiceWorker(
@@ -124,7 +124,7 @@ void ServiceWorkerDispatcher::UnregisterServiceWorker(
                            "ServiceWorkerDispatcher::UnregisterServiceWorker",
                            request_id, "Registration ID", registration_id);
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_UnregisterServiceWorker(
-      CurrentWorkerId(), request_id, provider_id, registration_id));
+      ServiceWorkerCurrentWorkerId(), request_id, provider_id, registration_id));
 }
 
 void ServiceWorkerDispatcher::EnableNavigationPreload(
@@ -136,7 +136,7 @@ void ServiceWorkerDispatcher::EnableNavigationPreload(
   int request_id =
       enable_navigation_preload_callbacks_.Add(std::move(callbacks));
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_EnableNavigationPreload(
-      CurrentWorkerId(), request_id, provider_id, registration_id, enable));
+      ServiceWorkerCurrentWorkerId(), request_id, provider_id, registration_id, enable));
 }
 
 void ServiceWorkerDispatcher::GetNavigationPreloadState(
@@ -147,7 +147,7 @@ void ServiceWorkerDispatcher::GetNavigationPreloadState(
   int request_id =
       get_navigation_preload_state_callbacks_.Add(std::move(callbacks));
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_GetNavigationPreloadState(
-      CurrentWorkerId(), request_id, provider_id, registration_id));
+      ServiceWorkerCurrentWorkerId(), request_id, provider_id, registration_id));
 }
 
 void ServiceWorkerDispatcher::SetNavigationPreloadHeader(
@@ -159,7 +159,7 @@ void ServiceWorkerDispatcher::SetNavigationPreloadHeader(
   int request_id =
       set_navigation_preload_header_callbacks_.Add(std::move(callbacks));
   thread_safe_sender_->Send(new ServiceWorkerHostMsg_SetNavigationPreloadHeader(
-      CurrentWorkerId(), request_id, provider_id, registration_id, value));
+      ServiceWorkerCurrentWorkerId(), request_id, provider_id, registration_id, value));
 }
 
 void ServiceWorkerDispatcher::AddProviderContext(
@@ -196,7 +196,7 @@ ServiceWorkerDispatcher*
 ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
     ThreadSafeSender* thread_safe_sender,
     base::SingleThreadTaskRunner* main_thread_task_runner) {
-  if (g_dispatcher_tls.Pointer()->Get() == kHasBeenDeleted) {
+  if (g_dispatcher_tls.Pointer()->Get() == kSWDispatcherHasBeenDeleted) {
     NOTREACHED() << "Re-instantiating TLS ServiceWorkerDispatcher.";
     g_dispatcher_tls.Pointer()->Set(NULL);
   }
@@ -212,7 +212,7 @@ ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance(
 }
 
 ServiceWorkerDispatcher* ServiceWorkerDispatcher::GetThreadSpecificInstance() {
-  if (g_dispatcher_tls.Pointer()->Get() == kHasBeenDeleted)
+  if (g_dispatcher_tls.Pointer()->Get() == kSWDispatcherHasBeenDeleted)
     return NULL;
   return static_cast<ServiceWorkerDispatcher*>(
       g_dispatcher_tls.Pointer()->Get());