diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 00:47:19 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 00:47:19 +0000 |
| commit | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (patch) | |
| tree | 208928d8e2565b28ab1a3e2e8beb64908fcb93de /chrome/browser | |
| parent | 609774a738bc51f5ba28ee21e551fe7328ad931b (diff) | |
| download | chromium_src-bf3ee201c1ca5112f7fd173fc4785aa52920c5c0.zip chromium_src-bf3ee201c1ca5112f7fd173fc4785aa52920c5c0.tar.gz chromium_src-bf3ee201c1ca5112f7fd173fc4785aa52920c5c0.tar.bz2 | |
Reland r105978: Report errors when extensions attempt to use
private APIs.
Revert was: http://codereview.chromium.org/8329012
Problem with Customization test was that the introduction of an error caused a
modal dialog which caused the test to time out. Removed the test because we
don't need to test this since we have general tests that ensure private APIs
are private elsewhere.
Problem with WebSocket test was that the manifest was requesting
customization permission even though it didn't use it. Introduction of error
message caused timeout same as above. In this case, just removing the
unneeded permission fixes the problem.
BUG=100489
TBR=jstritar@chromium.org
Review URL: http://codereview.chromium.org/8349017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_chrome_auth_private_apitest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_info_private_apitest_chromeos.cc | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/extensions/extension_chrome_auth_private_apitest.cc b/chrome/browser/extensions/extension_chrome_auth_private_apitest.cc index dc142461..b35ef72a 100644 --- a/chrome/browser/extensions/extension_chrome_auth_private_apitest.cc +++ b/chrome/browser/extensions/extension_chrome_auth_private_apitest.cc @@ -60,17 +60,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionChromeAuthPrivateApiTest, #endif // !defined(OS_CHROMEOS) IN_PROC_BROWSER_TEST_F(ExtensionChromeAuthPrivateApiTest, - SetCloudPrintCredentialsFailureInstalled) { - // Run this as an installed app. Since this is not a component app, it - // should fail. - ASSERT_TRUE(RunExtensionTest("chrome_auth_private/installed_app")); -} - -IN_PROC_BROWSER_TEST_F(ExtensionChromeAuthPrivateApiTest, SetCloudPrintCredentialsFailureInstalledComponent) { // Run this as an installed component app. This should also fail because of // the explicit URL check in the API. ASSERT_TRUE(RunComponentExtensionTest( "chrome_auth_private/installed_component_app")); } - diff --git a/chrome/browser/extensions/extension_info_private_apitest_chromeos.cc b/chrome/browser/extensions/extension_info_private_apitest_chromeos.cc index 3943b5a..da9ade1 100644 --- a/chrome/browser/extensions/extension_info_private_apitest_chromeos.cc +++ b/chrome/browser/extensions/extension_info_private_apitest_chromeos.cc @@ -6,8 +6,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CustomizationPrivateTest) { ASSERT_TRUE(RunComponentExtensionTest("chromeos_info_private")) << message_; } - -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CustomizationPrivateFailTest) { - // Only component extensions can use it. - ASSERT_FALSE(RunExtensionTest("chromeos_info_private")) << message_; -} |