An assembly includes a valve integration unit attached to a transmission oil heater. The valve integration unit includes a valve mechanism and a housing having first to sixth fluid ports for oil input and output. The interior space of the housing has a valve chamber to receive a thermal valve mechanism has a temperature responsive actuator. A bypass flow passage is located outside the heat exchanger and is in fluid communication with oil inlet and outlet manifolds through first and second bypass holes provided in the heat exchanger.