Merge pull request #898 from jlipps/master

allow / don't allow location services for app on ios
make chrome tests run against chromiumtestshell since it runs on x86 emulators