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

Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/notifications/NotificationPermissionClient.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebSerializedOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
 
 namespace blink {
 namespace {
 
 const int64_t kInvalidPersistentId = -1;
 
 WebNotificationManager* notificationManager()
@@ skipping 124 matching lines @@
     ASSERT(origin);
 
     // FIXME: Do CSP checks on the associated notification icon.
     WebNotificationData::Direction dir = m_dir == "rtl" ? WebNotificationData::DirectionRightToLeft : WebNotificationData::DirectionLeftToRight;
 
     // The lifetime and availability of non-persistent notifications is tied to the page
     // they were created by, and thus the data doesn't have to be known to the embedder.
     Vector<char> emptyDataWireBytes;
 
     WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_vibrate, m_silent, emptyDataWireBytes);
-    notificationManager()->show(WebSerializedOrigin(*origin), notificationData, this);
+    notificationManager()->show(*origin, notificationData, this);
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
     if (m_persistentId == kInvalidPersistentId) {
         // Fire the close event asynchronously.
         executionContext()->postTask(FROM_HERE, createSameThreadTask(&Notification::dispatchCloseEvent, this));
 
         m_state = NotificationStateClosing;
         notificationManager()->close(this);
     } else {
         m_state = NotificationStateClosed;
 
         SecurityOrigin* origin = executionContext()->securityOrigin();
         ASSERT(origin);
 
-        notificationManager()->closePersistent(WebSerializedOrigin(*origin), m_persistentId);
+        notificationManager()->closePersistent(*origin, m_persistentId);
     }
 }
 
 void Notification::dispatchShowEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::show));
 }
 
 void Notification::dispatchClickEvent()
 {
@@ skipping 48 matching lines @@
 String Notification::permission(ExecutionContext* context)
 {
     return permissionString(checkPermission(context));
 }
 
 WebNotificationPermission Notification::checkPermission(ExecutionContext* context)
 {
     SecurityOrigin* origin = context->securityOrigin();
     ASSERT(origin);
 
-    return notificationManager()->checkPermission(WebSerializedOrigin(*origin));
+    return notificationManager()->checkPermission(*origin);
 }
 
 void Notification::requestPermission(ExecutionContext* context, NotificationPermissionCallback* callback)
 {
     // FIXME: Assert that this code-path will only be reached for Document environments
     // when Blink supports [Exposed] annotations on class members in IDL definitions.
     if (NotificationPermissionClient* permissionClient = NotificationPermissionClient::from(context))
         permissionClient->requestPermission(context, callback);
 }
 
@@ skipping 30 matching lines @@
     return ScriptValue(scriptState, m_serializedData->deserialize(scriptState->isolate()));
 }
 
 DEFINE_TRACE(Notification)
 {
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink