Remove 'blink::WebSerializedOrigin' (4/5)

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 <cmath>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.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/child/worker_task_runner.h"
 #include "content/public/common/platform_notification_data.h"
-#include "third_party/WebKit/public/platform/WebSerializedOrigin.h"
+#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using blink::WebNotificationPermission;
 
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerTaskRunner::Instance()->CurrentWorkerId();
@@ skipping 30 matching lines @@
   if (CurrentWorkerId())
     WorkerTaskRunner::Instance()->AddStopObserver(manager);
   return manager;
 }
 
 void NotificationManager::OnWorkerRunLoopStopped() {
   delete this;
 }
 
 void NotificationManager::show(
-    const blink::WebSerializedOrigin& origin,
+    const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     blink::WebNotificationDelegate* delegate) {
   if (notification_data.icon.isEmpty()) {
     DisplayPageNotification(origin, notification_data, delegate, SkBitmap());
     return;
   }
 
   pending_notifications_.FetchPageNotificationResources(
       notification_data,
       delegate,
       base::Bind(&NotificationManager::DisplayPageNotification,
                  base::Unretained(this),  // this owns |pending_notifications_|
                  origin,
                  notification_data,
                  delegate));
 }
 
 void NotificationManager::showPersistent(
-    const blink::WebSerializedOrigin& origin,
+    const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebNotificationShowCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   int64_t service_worker_registration_id =
       static_cast<WebServiceWorkerRegistrationImpl*>(
           service_worker_registration)->registration_id();
 
   scoped_ptr<blink::WebNotificationShowCallbacks> owned_callbacks(callbacks);
 
@@ skipping 76 matching lines @@
     active_page_notifications_.erase(iter.first);
     return;
   }
 
   // It should not be possible for Blink to call close() on a Notification which
   // does not exist in either the pending or active notification lists.
   NOTREACHED();
 }
 
 void NotificationManager::closePersistent(
-    const blink::WebSerializedOrigin& origin,
+    const blink::WebSecurityOrigin& origin,
     int64_t persistent_notification_id) {
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_ClosePersistent(
-      GURL(origin.string()),
-      persistent_notification_id));
+      // TODO(mkwst): This is potentially doing the wrong thing with unique

[Peter Beverloo, 2015/07/10 14:19:17]

nit: We usually have these TODOs outside statements. (i.e. above line 189)

+      // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
+      // https://crbug.com/490074 for detail.

[Peter Beverloo, 2015/07/10 14:19:17]

There's a notifications browser test to verify that requesting permission for
file: origins *doesn't* work. We should discuss what the intended behavior there
is.

+      GURL(origin.toString()), persistent_notification_id));
 }
 
 void NotificationManager::notifyDelegateDestroyed(
     blink::WebNotificationDelegate* delegate) {
   if (pending_notifications_.CancelPageNotificationFetches(delegate))
     return;
 
   for (auto& iter : active_page_notifications_) {
     if (iter.second != delegate)
       continue;
 
     active_page_notifications_.erase(iter.first);
     return;
   }
 }
 
 WebNotificationPermission NotificationManager::checkPermission(
-    const blink::WebSerializedOrigin& origin) {
+    const blink::WebSecurityOrigin& origin) {
   WebNotificationPermission permission =
       blink::WebNotificationPermissionAllowed;
+  // 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_CheckPermission(
-      GURL(origin.string()), &permission));
+      GURL(origin.toString()), &permission));
 
   return permission;
 }
 
 bool NotificationManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NotificationManager, message)
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidShow, OnDidShow);
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidShowPersistent,
                         OnDidShowPersistent)
@@ skipping 69 matching lines @@
 
     (*notifications)[i] = web_notification_info;
   }
 
   callbacks->onSuccess(notifications.release());
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 void NotificationManager::DisplayPageNotification(
-    const blink::WebSerializedOrigin& origin,
+    const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     blink::WebNotificationDelegate* delegate,
     const SkBitmap& icon) {
   int notification_id =
       notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
 
   active_page_notifications_[notification_id] = delegate;
-  thread_safe_sender_->Send(
-      new PlatformNotificationHostMsg_Show(
-          notification_id,
-          GURL(origin.string()),
-          icon,
-          ToPlatformNotificationData(notification_data)));
+  // 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(
+      notification_id, GURL(origin.toString()), icon,
+      ToPlatformNotificationData(notification_data)));
 }
 
 void NotificationManager::DisplayPersistentNotification(
-    const blink::WebSerializedOrigin& origin,
+    const blink::WebSecurityOrigin& origin,
     const blink::WebNotificationData& notification_data,
     int64_t service_worker_registration_id,
     scoped_ptr<blink::WebNotificationShowCallbacks> callbacks,
     const SkBitmap& icon) {
   // 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());
 
   pending_show_notification_requests_.AddWithID(callbacks.release(),
                                                 request_id);
 
-  thread_safe_sender_->Send(
-      new PlatformNotificationHostMsg_ShowPersistent(
-          request_id,
-          service_worker_registration_id,
-          GURL(origin.string()),
-          icon,
-          ToPlatformNotificationData(notification_data)));
+  // 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, GURL(origin.toString()), icon,
+      ToPlatformNotificationData(notification_data)));
 }
 
 }  // namespace content