diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 22:46:47 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 22:46:47 +0000 |
| commit | 6d1c43b3e0324f6e870d9fc642f6135d990aee26 (patch) | |
| tree | f263ef45ec4cff6e6e88ae39d64459b26360f6e7 /chrome/browser/extensions/chrome_app_api_browsertest.cc | |
| parent | 73dca1b6e24c63f52cc2aaf44afdfb7c21df93a1 (diff) | |
| download | chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.zip chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.tar.gz chromium_src-6d1c43b3e0324f6e870d9fc642f6135d990aee26.tar.bz2 | |
Revert "Restrict extension features based on the extension type."
This breaks some ChromeOS tests. Among the log output:
"Feature 'chrome_url_overrides' is not allowed in this type of manifest."
Original review: http://codereview.chromium.org/8654001
BUG=101992, 104103, chromium-os:23709
TEST=no
Review URL: http://codereview.chromium.org/8786004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/chrome_app_api_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/chrome_app_api_browsertest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 738afe1..0f5219e 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/manifest.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" @@ -99,10 +98,10 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { scoped_ptr<DictionaryValue> app_details( static_cast<DictionaryValue*>( base::JSONReader::Read(result, false /* allow trailing comma */))); - // extension->manifest() does not contain the id. + // extension->manifest_value() does not contain the id. app_details->Remove("id", NULL); EXPECT_TRUE(app_details.get()); - EXPECT_TRUE(app_details->Equals(extension->manifest()->value())); + EXPECT_TRUE(app_details->Equals(extension->manifest_value())); // Try to change app.isInstalled. Should silently fail, so // that isInstalled should have the initial value. @@ -178,8 +177,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) { scoped_ptr<DictionaryValue> app_details( static_cast<DictionaryValue*>( base::JSONReader::Read(json, false /* allow trailing comma */))); - // extension->manifest() does not contain the id. + // extension->manifest_value() does not contain the id. app_details->Remove("id", NULL); EXPECT_TRUE(app_details.get()); - EXPECT_TRUE(app_details->Equals(extension->manifest()->value())); + EXPECT_TRUE(app_details->Equals(extension->manifest_value())); } |