Remove dead code behind ifndef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

Review URL: https://chromiumcodereview.appspot.com/12879013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189350 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 24 deletions

diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index 970070e..b2b509d 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -96,11 +96,7 @@ SimpleFileSystem::~SimpleFileSystem() {
 
 void SimpleFileSystem::OpenFileSystem(
     WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
     WebKit::WebFileSystemType type,
-#else
-    WebFileSystem::Type type,
-#endif
     long long, bool create,
     WebFileSystemCallbacks* callbacks) {
   if (!frame || !file_system_context_.get()) {
@@ -117,11 +113,7 @@ void SimpleFileSystem::OpenFileSystem(
 
 void SimpleFileSystem::DeleteFileSystem(
     WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
     WebKit::WebFileSystemType type,
-#else
-    WebFileSystem::Type type,
-#endif
     WebFileSystemCallbacks* callbacks) {
   if (!frame || !file_system_context_.get()) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/tools/test_shell/simple_file_system.h
index 6af770d..0e1ad03 100644
--- a/webkit/tools/test_shell/simple_file_system.h
+++ b/webkit/tools/test_shell/simple_file_system.h
@@ -39,20 +39,12 @@ class SimpleFileSystem
   virtual ~SimpleFileSystem();
 
   void OpenFileSystem(WebKit::WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
                       WebKit::WebFileSystemType type,
-#else
-                      WebKit::WebFileSystem::Type type,
-#endif
                       long long size,
                       bool create,
                       WebKit::WebFileSystemCallbacks* callbacks);
   void DeleteFileSystem(WebKit::WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
                         WebKit::WebFileSystemType type,
-#else
-                        WebKit::WebFileSystem::Type type,
-#endif
                         WebKit::WebFileSystemCallbacks* callbacks);
 
   fileapi::FileSystemContext* file_system_context() {
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index eddcfbb..2f46ecb 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -806,11 +806,7 @@ bool TestWebViewDelegate::allowScript(WebFrame* frame,
 
 void TestWebViewDelegate::openFileSystem(
     WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
     WebKit::WebFileSystemType type,
-#else
-    WebFileSystem::Type type,
-#endif
     long long size, bool create,
     WebFileSystemCallbacks* callbacks) {
   SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 6ea31af..667cf5f 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -228,11 +228,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
   virtual void openFileSystem(
       WebKit::WebFrame* frame,
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
       WebKit::WebFileSystemType type,
-#else
-      WebKit::WebFileSystem::Type type,
-#endif
       long long size,
       bool create,
       WebKit::WebFileSystemCallbacks* callbacks);