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

content/child/notifications/notification_manager.cc

Index: content/child/notifications/notification_manager.cc
diff --git a/content/child/notifications/notification_manager.cc b/content/child/notifications/notification_manager.cc
index e92f560bb66686afd66ba9067ce3544a820b49b7..b4803db8f95a789c4d5f5c536ffd808a4376db13 100644
--- a/content/child/notifications/notification_manager.cc
+++ b/content/child/notifications/notification_manager.cc
@@ -26,7 +26,7 @@ using blink::WebString;
 namespace content {
 namespace {
 
-int CurrentWorkerId() {
+int NotificationCurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
 
@@ -74,7 +74,7 @@ NotificationManager* NotificationManager::ThreadSpecificInstance(
 
   NotificationManager* manager =
       new NotificationManager(thread_safe_sender, notification_dispatcher);
-  if (CurrentWorkerId())
+  if (NotificationCurrentWorkerId())
     WorkerThread::AddObserver(manager);
   return manager;
 }
@@ -94,7 +94,7 @@ void NotificationManager::Show(
   GURL origin_gurl = url::Origin(origin).GetURL();
 
   int notification_id =
-      notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
+      notification_dispatcher_->GenerateNotificationId(NotificationCurrentWorkerId());
 
   active_page_notifications_[notification_id] = ActiveNotificationData(
       delegate, origin_gurl,
@@ -145,7 +145,7 @@ void NotificationManager::ShowPersistent(
   // TODO(peter): GenerateNotificationId is more of a request id. Consider
   // renaming the method in the NotificationDispatcher if this makes sense.
   int request_id =
-      notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
+      notification_dispatcher_->GenerateNotificationId(NotificationCurrentWorkerId());
 
   pending_show_notification_requests_.AddWithID(std::move(callbacks),
                                                 request_id);
@@ -177,7 +177,7 @@ void NotificationManager::GetNotifications(
   // TODO(peter): GenerateNotificationId is more of a request id. Consider
   // renaming the method in the NotificationDispatcher if this makes sense.
   int request_id =
-      notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
+      notification_dispatcher_->GenerateNotificationId(NotificationCurrentWorkerId());
 
   pending_get_notification_requests_.AddWithID(std::move(callbacks),
                                                request_id);