Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE

content/renderer/notification_provider.cc

 // Copyright (c) 2009 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/renderer/notification_provider.h"
 
 #include "base/string_util.h"
 #include "base/task.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/view_messages.h"
@@ skipping 84 matching lines @@
   if (message.type() == ViewMsg_Navigate::ID)
     OnNavigate();  // Don't want to swallow the message.
 
   return handled;
 }
 
 bool NotificationProvider::ShowHTML(const WebNotification& notification,
                                     int id) {
   DCHECK(notification.isHTML());
   DesktopNotificationHostMsg_Show_Params params;
-  params.origin =
-      GURL(render_view()->webview()->mainFrame()->url()).GetOrigin();
+  WebDocument document = render_view()->webview()->mainFrame()->document();
+  params.origin = GURL(document.securityOrigin().toString());
   params.is_html = true;
   params.contents_url = notification.url();
   params.notification_id = id;
   params.replace_id = notification.replaceId();
   return Send(new DesktopNotificationHostMsg_Show(routing_id(), params));
 }
 
 bool NotificationProvider::ShowText(const WebNotification& notification,
                                     int id) {
   DCHECK(!notification.isHTML());
   DesktopNotificationHostMsg_Show_Params params;
   params.is_html = false;
-  params.origin = GURL(
-      render_view()->webview()->mainFrame()->url()).GetOrigin();
+  WebDocument document = render_view()->webview()->mainFrame()->document();
+  params.origin = GURL(document.securityOrigin().toString());
   params.icon_url = notification.iconURL();
   params.title = notification.title();
   params.body = notification.body();
   params.direction = notification.direction();
   params.notification_id = id;
   params.replace_id = notification.replaceId();
   return Send(new DesktopNotificationHostMsg_Show(routing_id(), params));
 }
 
 void NotificationProvider::OnDisplay(int id) {
@@ skipping 37 matching lines @@
 void NotificationProvider::OnPermissionRequestComplete(int id) {
   WebNotificationPermissionCallback* callback = manager_.GetCallback(id);
   DCHECK(callback);
   callback->permissionRequestComplete();
   manager_.OnPermissionRequestComplete(id);
 }
 
 void NotificationProvider::OnNavigate() {
   manager_.Clear();
 }