delete webkit/support/simple_xxx's

webkit/support/webkit_support.cc

 // Copyright (c) 2012 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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 53 matching lines @@
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/renderer/media/media_stream_client.h"
 #include "webkit/renderer/media/webmediaplayer_impl.h"
 #include "webkit/renderer/media/webmediaplayer_ms.h"
 #include "webkit/renderer/media/webmediaplayer_params.h"
 #include "webkit/support/platform_support.h"
-#include "webkit/support/simple_appcache_system.h"
 #include "webkit/support/simple_database_system.h"
 #include "webkit/support/simple_dom_storage_system.h"
-#include "webkit/support/simple_file_system.h"
-#include "webkit/support/simple_resource_loader_bridge.h"
 #include "webkit/support/test_webkit_platform_support.h"
 #include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/web_layer_tree_view_impl_for_testing.h"
 
 #if defined(OS_ANDROID)
 #include "base/test/test_support_android.h"
 #include "webkit/support/test_stream_texture_factory_android.h"
 #endif
 
 using WebKit::WebCString;
@@ skipping 77 matching lines @@
       InitLogging();
     }
     main_message_loop_.reset(new MessageLoopType);
 
     // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
     webkit_platform_support_.reset(
         new TestWebKitPlatformSupport(unit_test_mode,
                                       shadow_platform_delegate));
   }
 
-  ~TestEnvironment() {
-    SimpleResourceLoaderBridge::Shutdown();
-  }
-
   TestWebKitPlatformSupport* webkit_platform_support() const {
     return webkit_platform_support_.get();
   }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void set_theme_engine(WebKit::WebThemeEngine* engine) {
     DCHECK(webkit_platform_support_ != 0);
     webkit_platform_support_->SetThemeEngine(engine);
   }
 
@@ skipping 234 matching lines @@
 #endif
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
     const WebURL& url,
     WebMediaPlayerClient* client) {
   return CreateMediaPlayer(frame, url, client, NULL);
 }
 
-WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
-    WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
-  return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
-}
-
 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) {
   return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace();
 }
 
 WebKit::WebString GetWebKitRootDir() {
   base::FilePath path = GetWebKitRootDirFilePath();
   std::string path_ascii = path.MaybeAsASCII();
   CHECK(!path_ascii.empty());
   return WebKit::WebString::fromUTF8(path_ascii.c_str());
 }
@@ skipping 323 matching lines @@
   SimpleDatabaseSystem::GetInstance()->SetDatabaseQuota(quota);
 }
 
 void ClearAllDatabases() {
   SimpleDatabaseSystem::GetInstance()->ClearAllDatabases();
 }
 
 // Bridge for SimpleResourceLoaderBridge
 
 void SetAcceptAllCookies(bool accept) {
-  SimpleResourceLoaderBridge::SetAcceptAllCookies(accept);
+  LOG(ERROR) << "XXX:" << accept;

[jamesr, 2013/06/20 04:58:00]

hmm, NOTREACHED() << accept; ?

[scottmg, 2013/06/20 05:04:32]

Done.

 }
 
 // Theme engine
 #if defined(OS_WIN) || defined(OS_MACOSX)
 
 void SetThemeEngine(WebKit::WebThemeEngine* engine) {
   DCHECK(test_environment);
   test_environment->set_theme_engine(engine);
 }
 
@@ skipping 12 matching lines @@
       return WebURL();
   }
 #if defined(OS_MACOSX)
   dirExe = dirExe.AppendASCII("../../..");
 #endif
   base::FilePath devToolsPath = dirExe.AppendASCII(
       "resources/inspector/devtools.html");
   return net::FilePathToFileURL(devToolsPath);
 }
 
-// FileSystem
-void OpenFileSystem(WebFrame* frame,
-    WebKit::WebFileSystemType type,
-    long long size, bool create, WebFileSystemCallbacks* callbacks) {
-  SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
-      test_environment->webkit_platform_support()->fileSystem());
-  fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
-}
-
-void DeleteFileSystem(WebFrame* frame,
-                      WebKit::WebFileSystemType type,
-                      WebFileSystemCallbacks* callbacks) {
-  SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
-      test_environment->webkit_platform_support()->fileSystem());
-  fileSystem->DeleteFileSystem(frame, type, callbacks);
-}
-
 WebKit::WebString RegisterIsolatedFileSystem(
     const WebKit::WebVector<WebKit::WebString>& filenames) {
   fileapi::IsolatedContext::FileInfoSet files;
   for (size_t i = 0; i < filenames.size(); ++i) {
     base::FilePath path = webkit_base::WebStringToFilePath(filenames[i]);
     files.AddPath(path, NULL);
   }
   std::string filesystemId =
       fileapi::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
   return UTF8ToUTF16(filesystemId);
@@ skipping 10 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support