Switch to WebFrame from the WebKit API....

chrome/renderer/external_host_bindings.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/external_host_bindings.h"
 
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
 #include "webkit/api/public/WebBindings.h"
-#include "webkit/glue/webframe.h"
 
 using WebKit::WebBindings;
 
 ExternalHostBindings::ExternalHostBindings() : frame_(NULL) {
   BindMethod("postMessage", &ExternalHostBindings::postMessage);
   BindProperty("onmessage", &on_message_handler_);
 }
 
 void ExternalHostBindings::postMessage(
     const CppArgumentList& args, CppVariant* result) {
@@ skipping 17 matching lines @@
         result->Set(false);
         return;
       }
       target = resolved.spec();
     }
   } else {
     target = "*";
   }
 
   std::string origin;
-  GURL origin_url(frame_->GetURL().GetOrigin());
+  GURL origin_url(GURL(frame_->url()).GetOrigin());
   if (origin_url.is_empty()) {
     // If the origin is not a scheme/host/port tuple, then return the literal
     // string "null".
     origin = "null";
   } else {
     origin = origin_url.spec();
   }
 
   result->Set(sender()->Send(new ViewHostMsg_ForwardMessageToExternalHost(
       routing_id(), message, origin, target)));
 }
 
 bool ExternalHostBindings::ForwardMessageFromExternalHost(
     const std::string& message, const std::string& origin,
     const std::string& target) {
   if (!on_message_handler_.isObject())
     return false;
 
   bool status = false;
 
   if (target.compare("*") != 0) {
-    GURL frame_url(frame_->GetURL());
+    GURL frame_url(frame_->url());
     GURL frame_origin(frame_url.GetOrigin());
     GURL target_origin(GURL(target).GetOrigin());
 
     // We want to compare the origins of the two URLs but first
     // we need to make sure that we don't compare an invalid one
     // to a valid one.
     bool drop = (frame_origin.is_valid() != target_origin.is_valid());
 
     if (!drop) {
       if (!frame_origin.is_valid()) {
@@ skipping 53 matching lines @@
     WebBindings::releaseObject(event_obj);
   }
 
   return status;
 }
 
 bool ExternalHostBindings::CreateMessageEvent(NPObject** message_event) {
   DCHECK(message_event != NULL);
   DCHECK(frame_ != NULL);
 
-  NPObject* window = frame_->GetWindowNPObject();
+  NPObject* window = frame_->windowObject();
   if (!window) {
-    NOTREACHED() << "frame_->GetWindowNPObject";
+    NOTREACHED() << "frame_->windowObject";
     return false;
   }
 
   const char* identifier_names[] = {
     "document",
     "createEvent",
   };
 
   NPIdentifier identifiers[arraysize(identifier_names)] = {0};
   WebBindings::getStringIdentifiers(identifier_names,
@@ skipping 15 matching lines @@
       DCHECK(success == false);
     } else {
       DCHECK(success != false);
       // Pass the ownership to the caller (don't call ReleaseVariantValue).
       *message_event = result.value.objectValue;
     }
   }
 
   return success;
 }