You need a lesson on quantifiers and collective nouns to understand this properly. 1.I need two bars/cakes of soap. 2. I need two rolls/cans of deodrant. 3. I need two cans of shaving cream. 4......two bottles of aftershave 5......two tubes of toothpaste 6......two tubes of shampoo ( can be bottles) 7.....two cans of hairspray 8......two tubes of sunscreen. etc The collective noun changes depending on what holds it. Please book a lesson if you want to learn more.

You would use the container form. For example: Two bars of soap, two bottles of lotion, a box of dental floss. I'm not really a wearer of makeup however - as far as I am aware you'd use bottles of nail polish, boxes of facepowder/ eye shadow/ mascara. For lipstick ex-girlfriends would refer to it as "two lipsticks" I hope that helps.