2 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 784092867c..4501202b8c 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,8 +1,8 @@
 require 'erubis'
-require 'set'
 require 'active_support/configurable'
 require 'active_support/descendants_tracker'
 require 'active_support/core_ext/module/anonymous'
+require 'active_support/core_ext/module/attr_internal'
 
 module AbstractController
   class Error < StandardError #:nodoc:
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 6db0941b52..6c0a072b73 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -24,9 +24,9 @@ module AbstractController
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
       if options[:html]
-        _set_content_type Mime::HTML.to_s
+        _set_html_content_type
       else
-        _set_content_type _get_content_type(rendered_format)
+        _set_rendered_content_type rendered_format
       end
       self.response_body
     end
@@ -106,11 +106,10 @@ module AbstractController
     def _process_format(format)
     end
 
-    def _get_content_type(rendered_format) # :nodoc:
-      rendered_format.to_s
+    def _set_html_content_type # :nodoc:
     end
 
-    def _set_content_type(type) # :nodoc:
+    def _set_rendered_content_type(format) # :nodoc:
     end
 
     # Normalize args and options.