Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4172)

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 933273002: Revert of Expose camera settings to the extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/content_settings/content_settings_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
index 747b84a3474c87aac65c613d2524fc87721054cd..b9a1f39b948e7131f66128efce16de381e4e7fd1 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -116,11 +116,6 @@
example_url,
CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
std::string()));
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(example_url,
- example_url,
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
- std::string()));
// Check content settings for www.google.com
GURL url("http://www.google.com");
@@ -150,9 +145,6 @@
EXPECT_EQ(CONTENT_SETTING_BLOCK,
map->GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- map->GetContentSetting(
- url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
}
void CheckContentSettingsDefault() {
@@ -191,9 +183,6 @@
EXPECT_EQ(CONTENT_SETTING_ASK,
map->GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(
- url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
}
private:
« no previous file with comments | « no previous file | chrome/browser/extensions/api/content_settings/content_settings_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698