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

content/child/notifications/notification_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/notifications/notification_manager.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/notifications/notification_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
 #include "url/origin.h"
 
 using blink::WebString;
 
 namespace content {
 namespace {
 
-int CurrentWorkerId() {
+int NotificationCurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
 
 NotificationResources ToNotificationResources(
     std::unique_ptr<blink::WebNotificationResources> web_resources) {
   NotificationResources resources;
   resources.image = web_resources->image;
   resources.notification_icon = web_resources->icon;
   resources.badge = web_resources->badge;
   for (const auto& action_icon : web_resources->action_icons)
@@ skipping 27 matching lines @@
 }
 
 NotificationManager* NotificationManager::ThreadSpecificInstance(
     ThreadSafeSender* thread_safe_sender,
     NotificationDispatcher* notification_dispatcher) {
   if (g_notification_manager_tls.Pointer()->Get())
     return g_notification_manager_tls.Pointer()->Get();
 
   NotificationManager* manager =
       new NotificationManager(thread_safe_sender, notification_dispatcher);
-  if (CurrentWorkerId())
+  if (NotificationCurrentWorkerId())
     WorkerThread::AddObserver(manager);
   return manager;
 }
 
 void NotificationManager::WillStopCurrentWorkerThread() {
   delete this;
 }
 
 void NotificationManager::Show(
     const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     std::unique_ptr<blink::WebNotificationResources> notification_resources,
     blink::WebNotificationDelegate* delegate) {
   DCHECK_EQ(0u, notification_data.actions.size());
   DCHECK_EQ(0u, notification_resources->action_icons.size());
 
   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,
       notification_data.tag.Utf8(
           WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD));
 
   // TODO(mkwst): This is potentially doing the wrong thing with unique
   // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
   // https://crbug.com/490074 for detail.
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_Show(
@@ skipping 30 matching lines @@
   UMA_HISTOGRAM_COUNTS_1000("Notifications.AuthorDataSize", author_data_size);
 
   if (author_data_size > PlatformNotificationData::kMaximumDeveloperDataSize) {
     callbacks->OnError();
     return;
   }
 
   // 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);
 
   // TODO(mkwst): This is potentially doing the wrong thing with unique
   // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
   // https://crbug.com/490074 for detail.
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_ShowPersistent(
       request_id, service_worker_registration_id, url::Origin(origin).GetURL(),
       ToPlatformNotificationData(notification_data),
@@ skipping 11 matching lines @@
       static_cast<WebServiceWorkerRegistrationImpl*>(
           service_worker_registration);
 
   GURL origin = GURL(service_worker_registration_impl->Scope()).GetOrigin();
   int64_t service_worker_registration_id =
       service_worker_registration_impl->RegistrationId();
 
   // 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);
 
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_GetNotifications(
       request_id, service_worker_registration_id, origin,
       filter_tag.Utf8(
           WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD)));
 }
 
@@ skipping 117 matching lines @@
 
     notifications[i] = web_notification_info;
   }
 
   callbacks->OnSuccess(notifications);
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 }  // namespace content