Move ContentType inline for now.

Trying to avoid premature proliferation of modules.

actionpack/lib/action_controller/new_base.rb

@@ -1,5 +1,4 @@
 module ActionController
-  autoload :ContentType,          "action_controller/new_base/content_type"
   autoload :HideActions,          "action_controller/new_base/hide_actions"
   autoload :Http,                 "action_controller/new_base/base"
   autoload :Layouts,              "action_controller/new_base/layouts"

actionpack/lib/action_controller/new_base/content_type.rb

@@ -1,15 +0,0 @@
-module ActionController
-  module ContentType
-    
-    def render_to_body(options = {})
-      if content_type = options[:content_type]
-        response.content_type = content_type
-      end
-      
-      ret = super
-      response.content_type ||= options[:_template].mime_type
-      ret
-    end
-
-  end
-end

actionpack/lib/action_controller/new_base/renderer.rb

@@ -24,7 +24,9 @@ module ActionController
         options[:_prefix] = _prefix 
       end
       
-      super(options)
+      ret = super(options)
+      response.content_type ||= options[:_template].mime_type
+      ret
     end
     
   private
@@ -43,9 +45,9 @@ module ActionController
     end
   
     def _process_options(options)
-      if status = options[:status]
+      status, content_type = options.values_at(:status, :content_type)
-        response.status = status.to_i
+      response.status = status.to_i if status
-      end
+      response.content_type = content_type if content_type
     end
   end
 end

actionpack/test/new_base/test_helper.rb

@@ -42,7 +42,6 @@ module ActionController
     use ActionController::UrlFor
     use ActionController::Renderer
     use ActionController::Layouts
-    use ActionController::ContentType
     
     def self.inherited(klass)
       ::ActionController::Base2.subclasses << klass.to_s