Declaring a firearm on a flight to California

Ive declared a firearm when checking a bag many times and never had any issues. But I am weary of how this will go with their new ammo law etc.

I always locked the gun empty in at TSA approved case and locked my ammo up in a seperate case. But I dont want to catch hell for flying 10 rounds of ammo into california.

Any input?