With all of the new restrictions imposed by last week's terrorist activity, I would not count on carrying on anything liquid, including shampoo, make-up, etc.
I had some friends traveling on Sunday (after the new restrictions were in place) and they said they were making passengers throw away anything that could possibly be a problem -- and we're talking about things like liquid make-up, shampoo, chapstick, lipstick, etc.! You can check this stuff in your checked luggage, but they will make you toss out anything remotely suspicious in their carry-ons. There were many people upset with these new rules (one woman said they were making her throw away about $500 worth of beauty products!) because they didn't tell you about the restrictions until they reached the security checkpoints; because everyone had had already checked their baggage, it didn't give people a chance to move things from their carry-ons to their checked luggage.
Just be aware of the new restrictions and plan to check anything potentially suspicious.