Switch to WebFrame from the WebKit API....

chrome/renderer/extensions/extension_process_bindings.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 "chrome/renderer/extensions/extension_process_bindings.h"
 
 #include "base/singleton.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/js_only_v8_extensions.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/common_resources.h"
 #include "grit/renderer_resources.h"
-#include "webkit/glue/webframe.h"
+#include "webkit/api/public/WebFrame.h"
 
 using bindings_utils::GetStringResource;
 using bindings_utils::ContextInfo;
 using bindings_utils::ContextList;
 using bindings_utils::GetContexts;
 using bindings_utils::GetPendingRequestMap;
 using bindings_utils::PendingRequest;
 using bindings_utils::PendingRequestMap;
 using bindings_utils::ExtensionBase;
 
@@ skipping 46 matching lines @@
       name_set->insert(names[i]);
     }
   }
 
   // Note: do not call this function before or during the chromeHidden.onLoad
   // event dispatch. The URL might not have been committed yet and might not
   // be an extension URL.
   static std::string ExtensionIdForCurrentContext() {
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     DCHECK(renderview);
-    GURL url = renderview->webview()->GetMainFrame()->GetURL();
+    GURL url = renderview->webview()->GetMainFrame()->url();
     if (url.SchemeIs(chrome::kExtensionScheme))
       return url.host();
     return std::string();
   }
 
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
       v8::Handle<v8::String> name) {
     if (name->Equals(v8::String::New("GetExtensionAPIDefinition"))) {
       return v8::FunctionTemplate::New(GetExtensionAPIDefinition);
     } else if (name->Equals(v8::String::New("GetViews"))) {
@@ skipping 89 matching lines @@
 
   // Starts an API request to the browser, with an optional callback.  The
   // callback will be dispatched to EventBindings::HandleResponse.
   static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args) {
     // Get the current RenderView so that we can send a routed IPC message from
     // the correct source.
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
 
-    if (args.Length() != 4 || !args[0]->IsString() || !args[1]->IsString() || 
+    if (args.Length() != 4 || !args[0]->IsString() || !args[1]->IsString() ||
         !args[2]->IsInt32() || !args[3]->IsBoolean())
       return v8::Undefined();
 
     std::string name = *v8::String::AsciiValue(args[0]);
     if (GetFunctionNameSet()->find(name) == GetFunctionNameSet()->end()) {
       NOTREACHED() << "Unexpected function " << name;
       return v8::Undefined();
     }
 
     if (!ExtensionProcessBindings::CurrentContextHasPermission(name))
@@ skipping 126 matching lines @@
 
   v8::Local<v8::Function> function =
       v8::Local<v8::Function>::Cast(console_error);
   v8::Local<v8::Value> argv[] = { v8::String::New(error_msg.c_str()) };
   if (!function.IsEmpty())
     function->Call(console->ToObject(), arraysize(argv), argv);
 
   return v8::Undefined();
 #endif
 }