Switch to WebFrame from the WebKit API....

chrome/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2006-2008 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 "chrome/renderer/webplugin_delegate_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
@@ skipping 17 matching lines @@
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/mime_util.h"
 #include "printing/native_metafile.h"
 #include "webkit/api/public/WebBindings.h"
 #include "webkit/api/public/WebCursorInfo.h"
 #include "webkit/api/public/WebDragData.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/webview.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/scoped_cftyperef.h"
@@ skipping 122 matching lines @@
       plugin_(NULL),
       windowless_(false),
       window_(NULL),
       mime_type_(mime_type),
       clsid_(clsid),
       npobject_(NULL),
       window_script_object_(NULL),
       sad_plugin_(NULL),
       invalidate_pending_(false),
       transparent_(false),
-      page_url_(render_view_->webview()->GetMainFrame()->GetURL()) {
+      page_url_(render_view_->webview()->GetMainFrame()->url()) {
 }
 
 WebPluginDelegateProxy::~WebPluginDelegateProxy() {
 }
 
 void WebPluginDelegateProxy::PluginDestroyed() {
   plugin_ = NULL;
 
   if (npobject_) {
     // When we destroy the plugin instance, the NPObjectStub NULLs out its
@@ skipping 797 matching lines @@
     intptr_t existing_stream, bool notify_needed, intptr_t notify_data) {
   plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
                                     existing_stream, notify_needed,
                                     notify_data);
 }
 
 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id,
                                                     bool defer) {
   plugin_->SetDeferResourceLoading(resource_id, defer);
 }