diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 02:10:11 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 02:10:11 +0000 |
| commit | 4636c837d247f6fa7d4982160643f39d752c2ed5 (patch) | |
| tree | db91cc6c57fd3e6f79a2c7d64ec553daabaa6e0d /chrome/browser/extensions/content_script_apitest.cc | |
| parent | 0ccf9d61123b5f9494e313dd79db73b658239196 (diff) | |
| download | chromium_src-4636c837d247f6fa7d4982160643f39d752c2ed5.zip chromium_src-4636c837d247f6fa7d4982160643f39d752c2ed5.tar.gz chromium_src-4636c837d247f6fa7d4982160643f39d752c2ed5.tar.bz2 | |
Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it
was only run on IDL files. Clean up all the code which that simplifies.
TBR=isherman@chromium.org,battre@chromium.org,akalin@chromium.org
BUG=141318
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176015
Review URL: https://codereview.chromium.org/11747025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/content_script_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/content_script_apitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index b675403..d1a71f3 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -163,8 +163,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionAPIs) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptPermissionsApi) { - RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); - RequestPermissionsFunction::SetAutoConfirmForTests(true); + PermissionsRequestFunction::SetIgnoreUserGestureForTests(true); + PermissionsRequestFunction::SetAutoConfirmForTests(true); host_resolver()->AddRule("*.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_; |