summaryrefslogtreecommitdiffstats
path: root/extensions/shell/app_shell.gyp
diff options
context:
space:
mode:
authorthiago.santos <thiago.santos@intel.com>2015-01-21 06:39:25 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-21 14:41:44 +0000
commitef0ffb7c3d8532fa50a50ac8d3a4de9e8ef6492f (patch)
tree04f1e3e2cc6e35270c87df63c6f44b663ceb9950 /extensions/shell/app_shell.gyp
parente97add26342fadfb9be1d5e68a49e3e6eebbfe82 (diff)
downloadchromium_src-ef0ffb7c3d8532fa50a50ac8d3a4de9e8ef6492f.zip
chromium_src-ef0ffb7c3d8532fa50a50ac8d3a4de9e8ef6492f.tar.gz
chromium_src-ef0ffb7c3d8532fa50a50ac8d3a4de9e8ef6492f.tar.bz2
Fix crash when CreateAccessTokenStore() is not implemented
Do not assume that GetAccessTokenStore() - that internally calls CreateAccessTokenStore() - will always return a valid object because it will return NULL in case it is not implemented by the embedder (like currently in app_shell). Also, do not start location providers if the AccessTokenStore was not created and return "permission denied" for location requests. Review URL: https://codereview.chromium.org/795093003 Cr-Commit-Position: refs/heads/master@{#312377}
Diffstat (limited to 'extensions/shell/app_shell.gyp')
-rw-r--r--extensions/shell/app_shell.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 7c60171..63fa2a2 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -332,6 +332,7 @@
'../browser/guest_view/web_view/web_view_apitest.cc',
'../browser/guest_view/web_view/web_view_media_access_apitest.cc',
'../browser/updater/update_service_browsertest.cc',
+ 'browser/geolocation/geolocation_apitest.cc',
'browser/shell_browsertest.cc',
'test/shell_apitest.cc',
'test/shell_apitest.h',