Switch to WebFrame from the WebKit API....

chrome/renderer/loadtimes_extension_bindings.cc

 // Copyright (c) 2006-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/loadtimes_extension_bindings.h"
 
 #include <math.h>
 
 #include "base/time.h"
 #include "chrome/renderer/navigation_state.h"
+#include "webkit/api/public/WebFrame.h"
 #include "v8/include/v8.h"
-#include "webkit/glue/webframe.h"
 
 using WebKit::WebDataSource;
+using WebKit::WebFrame;
 using WebKit::WebNavigationType;
 
 // Values for CSI "tran" property
 const int kTransitionLink = 0;
 const int kTransitionForwardBack = 6;
 const int kTransitionOther = 15;
 const int kTransitionReload = 16;
 
 namespace extensions_v8 {
 
@@ skipping 62 matching lines @@
         return kTransitionForwardBack;
       case WebKit::WebNavigationTypeReload:
         return kTransitionReload;
       case WebKit::WebNavigationTypeOther:
         return kTransitionOther;
     }
     return kTransitionOther;
   }
 
   static v8::Handle<v8::Value> GetLoadTimes(const v8::Arguments& args) {
-    WebFrame* frame = WebFrame::RetrieveFrameForEnteredContext();
+    WebFrame* frame = WebFrame::frameForEnteredContext();
     if (frame) {
-      WebDataSource* data_source = frame->GetDataSource();
+      WebDataSource* data_source = frame->dataSource();
       if (data_source) {
         NavigationState* navigation_state =
             NavigationState::FromDataSource(data_source);
         v8::Local<v8::Object> load_times = v8::Object::New();
         load_times->Set(
             v8::String::New("requestTime"),
             v8::Number::New(navigation_state->request_time().ToDoubleT()));
         load_times->Set(
             v8::String::New("startLoadTime"),
             v8::Number::New(navigation_state->start_load_time().ToDoubleT()));
@@ skipping 18 matching lines @@
             v8::String::New("navigationType"),
             v8::String::New(GetNavigationType(data_source->navigationType())));
 
         return load_times;
       }
     }
     return v8::Null();
   }
 
   static v8::Handle<v8::Value> GetCSI(const v8::Arguments& args) {
-    WebFrame* frame = WebFrame::RetrieveFrameForEnteredContext();
+    WebFrame* frame = WebFrame::frameForEnteredContext();
     if (frame) {
-      WebDataSource* data_source = frame->GetDataSource();
+      WebDataSource* data_source = frame->dataSource();
       if (data_source) {
         NavigationState* navigation_state =
             NavigationState::FromDataSource(data_source);
         v8::Local<v8::Object> csi = v8::Object::New();
         base::Time now = base::Time::Now();
         base::Time start = navigation_state->request_time().is_null() ?
             navigation_state->start_load_time() :
             navigation_state->request_time();
         base::Time onload = navigation_state->finish_document_load_time();
         base::TimeDelta page = now - start;
@@ skipping 16 matching lines @@
     }
     return v8::Null();
   }
 };
 
 v8::Extension* LoadTimesExtension::Get() {
   return new LoadTimesExtensionWrapper();
 }
 
 }  // namespace extensions_v8