> States will prefer the former to the latter and firms will provide, at which point I don't think that the definition of safety-from is necessary.

I do believe that, at some point, people will as well. If other options prove too expensive or too inefficient, it's not just states that will prefer near complete mass surveillance.