Switch to WebFrame from the WebKit API....

chrome/renderer/user_script_slave.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/user_script_slave.h"
 
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/perftimer.h"
 #include "base/pickle.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "chrome/renderer/extension_groups.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebScriptSource.h"
-#include "webkit/glue/webframe.h"
 
 #include "grit/renderer_resources.h"
 
+using WebKit::WebFrame;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 
 // These two strings are injected before and after the Greasemonkey API and
 // user script to wrap it in an anonymous scope.
 static const char kUserScriptHead[] = "(function (unsafeWindow) {\n";
 static const char kUserScriptTail[] = "\n})(window);";
 
 // Creates a convenient reference to a content script's parent extension.
 // TODO(mpcomplete): self.onConnect is deprecated.  Remove it at 1.0.
@@ skipping 73 matching lines @@
           StringPiece(body, body_length));
     }
   }
 
   return true;
 }
 
 bool UserScriptSlave::InjectScripts(WebFrame* frame,
                                     UserScript::RunLocation location) {
   // Don't bother if this is not a URL we inject script into.
-  if (!URLPattern::IsValidScheme(frame->GetURL().scheme()))
+  if (!URLPattern::IsValidScheme(GURL(frame->url()).scheme()))
     return true;
 
   PerfTimer timer;
   int num_matched = 0;
 
   for (size_t i = 0; i < scripts_.size(); ++i) {
     std::vector<WebScriptSource> sources;
     UserScript* script = scripts_[i];
-    if (!script->MatchesUrl(frame->GetURL()))
+    if (!script->MatchesUrl(frame->url()))
       continue;  // This frame doesn't match the script url pattern, skip it.
 
     ++num_matched;
     // CSS files are always injected on document start before js scripts.
     if (location == UserScript::DOCUMENT_START) {
       for (size_t j = 0; j < script->css_scripts().size(); ++j) {
         UserScript::File& file = script->css_scripts()[j];
-        frame->InsertCSSStyles(file.GetContent().as_string());
+        frame->insertStyleText(
+            WebString::fromUTF8(file.GetContent().as_string()));
       }
     }
     if (script->run_location() == location) {
       for (size_t j = 0; j < script->js_scripts().size(); ++j) {
         UserScript::File &file = script->js_scripts()[j];
         std::string content = file.GetContent().as_string();
 
         // We add this dumb function wrapper for standalone user script to
         // emulate what Greasemonkey does.
         if (script->is_standalone()) {
@@ skipping 12 matching lines @@
         sources.insert(sources.begin(),
             WebScriptSource(WebString::fromUTF8(api_js_.as_string())));
       } else {
         // Setup chrome.self to contain an Extension object with the correct
         // ID.
         sources.insert(sources.begin(),
             WebScriptSource(WebString::fromUTF8(
                 StringPrintf(kInitExtension, script->extension_id().c_str()))));
       }
 
-      frame->ExecuteScriptInNewWorld(&sources.front(), sources.size(),
+      frame->executeScriptInNewWorld(&sources.front(), sources.size(),
                                      EXTENSION_GROUP_CONTENT_SCRIPTS);
     }
   }
 
   // Log debug info.
   if (location == UserScript::DOCUMENT_START) {
     HISTOGRAM_COUNTS_100("UserScripts:DocStart:Count", num_matched);
     HISTOGRAM_TIMES("UserScripts:DocStart:Time", timer.Elapsed());
   } else {
     HISTOGRAM_COUNTS_100("UserScripts:DocEnd:Count", num_matched);
     HISTOGRAM_TIMES("UserScripts:DocEnd:Time", timer.Elapsed());
   }
 
   LOG(INFO) << "Injected " << num_matched << " user scripts into " <<
-      frame->GetURL().spec();
+      frame->url().spec().data();
   return true;
 }