3 files changed, 14 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 6691f85..a79f39b 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -54,6 +54,7 @@ using WebKit::WebCanvas;
 using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
+using WebKit::WebScriptController;
 using WebKit::WebSize;
 using WebKit::WebURLRequest;
 using WebKit::WebView;
@@ -195,7 +196,7 @@ void TestShell::Dump(TestShell* shell) {
   if ((shell == NULL) || ((params = shell->test_params()) == NULL))
     return;
 
-  WebKit::flushConsoleMessages();
+  WebScriptController::flushConsoleMessages();
   // Echo the url in the output so we know we're not getting out of sync.
   printf("#URL:%s\n", params->test_url.c_str());
 
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 8b716b1..9f2ae67 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -40,6 +40,8 @@
 
 static const size_t kPathBufSize = 2048;
 
+using WebKit::WebScriptController;
+
 namespace {
 
 // StatsTable initialization parameters.
@@ -215,10 +217,11 @@ int main(int argc, char* argv[]) {
   js_flags += L" --expose-gc";
   webkit_glue::SetJavaScriptFlags(js_flags);
   // Expose GCController to JavaScript.
-  WebKit::registerExtension(extensions_v8::GCExtension::Get());
+  WebScriptController::registerExtension(extensions_v8::GCExtension::Get());
 
   if (parsed_command_line.HasSwitch(test_shell::kProfiler)) {
-    WebKit::registerExtension(extensions_v8::ProfilerExtension::Get());
+    WebScriptController::registerExtension(
+        extensions_v8::ProfilerExtension::Get());
   }
 
   // Load and initialize the stats table.  Attempt to construct a somewhat
@@ -235,7 +238,8 @@ int main(int argc, char* argv[]) {
   if (TestShell::CreateNewWindow(starting_url, &shell)) {
     if (record_mode || playback_mode) {
       platform.SetWindowPositionForRecording(shell);
-      WebKit::registerExtension(extensions_v8::PlaybackExtension::Get());
+      WebScriptController::registerExtension(
+          extensions_v8::PlaybackExtension::Get());
     }
 
     shell->Show(WebKit::WebNavigationPolicyNewWindow);
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 98b0602..4ec7c55 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -50,9 +50,11 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
         ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
     WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(
         ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
-    WebKit::enableV8SingleThreadMode();
-    WebKit::registerExtension(extensions_v8::GearsExtension::Get());
-    WebKit::registerExtension(extensions_v8::IntervalExtension::Get());
+    WebKit::WebScriptController::enableV8SingleThreadMode();
+    WebKit::WebScriptController::registerExtension(
+        extensions_v8::GearsExtension::Get());
+    WebKit::WebScriptController::registerExtension(
+        extensions_v8::IntervalExtension::Get());
     WebKit::enableWebSockets();
 
     // Load libraries for media and enable the media player.