1 files changed, 5 insertions, 21 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 54148b55d8..d8a1662acc 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -62,14 +62,7 @@ module ActionController #:nodoc:
 
           cache_filter = ActionCacheFilter.new(:layout => options.delete(:layout), :cache_path => options.delete(:cache_path), :store_options => options)
 
-          # TODO: Remove this once new base is swapped in.
-          if defined?(ActionController::Http)
-            around_filter cache_filter, filter_options
-          else
-            around_filter(filter_options) do |controller, action|
-              cache_filter.filter(controller, action)
-            end
-          end
+          around_filter cache_filter, filter_options
         end
       end
 
@@ -91,19 +84,10 @@ module ActionController #:nodoc:
           @options = options
         end
 
-        # TODO: Remove once New Base is merged
-        if defined?(ActionController::Http)
-          def filter(controller)
-            should_continue = before(controller)
-            yield if should_continue
-            after(controller)
-          end
-        else
-          def filter(controller, action)
-            should_continue = before(controller)
-            action.call if should_continue
-            after(controller)
-          end
+        def filter(controller)
+          should_continue = before(controller)
+          yield if should_continue
+          after(controller)
         end
 
         def before(controller)