diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 00:44:24 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 00:44:24 +0000 |
| commit | a8aa85beefc6146c3881fb41e14a60cfff8b9710 (patch) | |
| tree | a2ca5835e32c0463489c3a2663616e9e771dfa0f /chrome/common | |
| parent | 563fb5fc1b451d356fcf5e5ced3591b7181d3874 (diff) | |
| download | chromium_src-a8aa85beefc6146c3881fb41e14a60cfff8b9710.zip chromium_src-a8aa85beefc6146c3881fb41e14a60cfff8b9710.tar.gz chromium_src-a8aa85beefc6146c3881fb41e14a60cfff8b9710.tar.bz2 | |
Revert r12998 - it broke some media/mime-related layout tests.
TBR=pkasting@chromium.org, scherkus@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9950039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/api/extension_api.cc | 2 | ||||
| -rw-r--r-- | chrome/common/extensions/api/extension_api_unittest.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index 3178975..6bbd8df 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -268,12 +268,10 @@ bool ExtensionAPI::IsPrivileged(const std::string& full_name) { std::vector<std::string> split; base::SplitString(full_name, '.', &split); std::reverse(split.begin(), split.end()); - CHECK(!split.empty()); // |full_name| was empty or only whitespace. api_name = split.back(); split.pop_back(); if (api_name == "experimental") { - CHECK(!split.empty()); // |full_name| was "experimental" alone. api_name += "." + split.back(); split.pop_back(); } diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index 1c5a22e3..bf240e1 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -26,6 +26,7 @@ TEST(ExtensionAPI, IsPrivileged) { EXPECT_TRUE(extension_api.IsPrivileged("extension.lastError")); // Default unknown names to privileged for paranoia's sake. + EXPECT_TRUE(extension_api.IsPrivileged("")); EXPECT_TRUE(extension_api.IsPrivileged("<unknown-namespace>")); EXPECT_TRUE(extension_api.IsPrivileged("extension.<unknown-member>")); |