Introduce WebSecurityPolicy for security related methods

webkit/tools/test_shell/layout_test_controller.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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
+#include "webkit/api/public/WebSecurityPolicy.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebView.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
 using WebKit::WebConsoleMessage;
 using WebKit::WebScriptSource;
+using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 
 TestShell* LayoutTestController::shell_ = NULL;
 // Most of these flags need to be cleared in Reset() so that they get turned
 // off between each test run.
 bool LayoutTestController::dump_as_text_ = false;
 bool LayoutTestController::dump_editing_callbacks_ = false;
 bool LayoutTestController::dump_frame_load_callbacks_ = false;
 bool LayoutTestController::dump_resource_load_callbacks_ = false;
 bool LayoutTestController::dump_back_forward_list_ = false;
@@ skipping 387 matching lines @@
   dump_title_changes_ = false;
   accepts_editing_ = true;
   wait_until_done_ = false;
   can_open_windows_ = false;
   should_add_file_to_pasteboard_ = false;
   stop_provisional_frame_loads_ = false;
   globalFlag_.Set(false);
   webHistoryItemCount_.Set(0);
 
   SimpleResourceLoaderBridge::SetAcceptAllCookies(false);
-  WebKit::resetOriginAccessWhiteLists();
+  WebSecurityPolicy::resetOriginAccessWhiteLists();
 
   setlocale(LC_ALL, "");
 
   if (close_remaining_windows_) {
     // Iterate through the window list and close everything except the original
     // shell.  We don't want to delete elements as we're iterating, so we copy
     // to a temp vector first.
     WindowList* windows = TestShell::windowList();
     std::vector<gfx::NativeWindow> windows_to_delete;
     for (WindowList::iterator i = windows->begin(); i != windows->end(); ++i) {
@@ skipping 509 matching lines @@
   result->SetNull();
 
   if (args.size() != 4 || !args[0].isString() || !args[1].isString() ||
       !args[2].isString() || !args[3].isBool())
     return;
 
   WebKit::WebURL url(GURL(args[0].ToString()));
   if (!url.isValid())
     return;
 
-  WebKit::whiteListAccessFromOrigin(url,
-                                    WebString::fromUTF8(args[1].ToString()),
-                                    WebString::fromUTF8(args[2].ToString()),
-                                    args[3].ToBoolean());
+  WebSecurityPolicy::whiteListAccessFromOrigin(url,
+      WebString::fromUTF8(args[1].ToString()),
+      WebString::fromUTF8(args[2].ToString()),
+       args[3].ToBoolean());
 }
 
 void LayoutTestController::clearAllDatabases(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
   SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
 }
 
 void LayoutTestController::setPOSIXLocale(const CppArgumentList& args,
                                           CppVariant* result) {
   result->SetNull();
   if (args.size() == 1 && args[0].isString()) {
     std::string new_locale = args[0].ToString();
     setlocale(LC_ALL, new_locale.c_str());
   }
 }
 
 void LayoutTestController::LogErrorToConsole(const std::string& text) {
   shell_->delegate()->didAddMessageToConsole(
       WebConsoleMessage(WebConsoleMessage::LevelError,
                         WebString::fromUTF8(text)),
       WebString(), 0);
 }