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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 2358893004: Deprecate chrome.contentSettings.{fullscreen,mouselock} extension API. (Closed)
Patch Set: Respond to review. Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/common/extensions/api/content_settings.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 CONTENT_SETTINGS_TYPE_GEOLOCATION, 102 CONTENT_SETTINGS_TYPE_GEOLOCATION,
103 std::string())); 103 std::string()));
104 EXPECT_EQ(CONTENT_SETTING_ASK, 104 EXPECT_EQ(CONTENT_SETTING_ASK,
105 map->GetContentSetting(example_url, 105 map->GetContentSetting(example_url,
106 example_url, 106 example_url,
107 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 107 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
108 std::string())); 108 std::string()));
109 EXPECT_EQ(CONTENT_SETTING_ASK, 109 EXPECT_EQ(CONTENT_SETTING_ASK,
110 map->GetContentSetting(example_url, 110 map->GetContentSetting(example_url,
111 example_url, 111 example_url,
112 CONTENT_SETTINGS_TYPE_FULLSCREEN,
113 std::string()));
114 EXPECT_EQ(CONTENT_SETTING_ASK,
115 map->GetContentSetting(example_url,
116 example_url,
117 CONTENT_SETTINGS_TYPE_MOUSELOCK,
118 std::string()));
119 EXPECT_EQ(CONTENT_SETTING_ASK,
120 map->GetContentSetting(example_url,
121 example_url,
122 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 112 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
123 std::string())); 113 std::string()));
124 EXPECT_EQ(CONTENT_SETTING_ASK, 114 EXPECT_EQ(CONTENT_SETTING_ASK,
125 map->GetContentSetting(example_url, 115 map->GetContentSetting(example_url,
126 example_url, 116 example_url,
127 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 117 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
128 std::string())); 118 std::string()));
129 EXPECT_EQ(CONTENT_SETTING_ASK, 119 EXPECT_EQ(CONTENT_SETTING_ASK,
130 map->GetContentSetting(example_url, 120 map->GetContentSetting(example_url,
131 example_url, 121 example_url,
(...skipping 25 matching lines...) Expand all
157 EXPECT_EQ(CONTENT_SETTING_ALLOW, 147 EXPECT_EQ(CONTENT_SETTING_ALLOW,
158 map->GetContentSetting( 148 map->GetContentSetting(
159 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); 149 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
160 EXPECT_EQ(CONTENT_SETTING_BLOCK, 150 EXPECT_EQ(CONTENT_SETTING_BLOCK,
161 map->GetContentSetting( 151 map->GetContentSetting(
162 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); 152 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
163 EXPECT_EQ( 153 EXPECT_EQ(
164 CONTENT_SETTING_BLOCK, 154 CONTENT_SETTING_BLOCK,
165 map->GetContentSetting( 155 map->GetContentSetting(
166 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); 156 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
167 EXPECT_EQ(CONTENT_SETTING_ALLOW,
168 map->GetContentSetting(
169 url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string()));
170 EXPECT_EQ(CONTENT_SETTING_BLOCK,
171 map->GetContentSetting(
172 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
173 EXPECT_EQ(CONTENT_SETTING_BLOCK, 157 EXPECT_EQ(CONTENT_SETTING_BLOCK,
174 map->GetContentSetting( 158 map->GetContentSetting(
175 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 159 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
176 EXPECT_EQ(CONTENT_SETTING_BLOCK, 160 EXPECT_EQ(CONTENT_SETTING_BLOCK,
177 map->GetContentSetting( 161 map->GetContentSetting(
178 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string())); 162 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
179 EXPECT_EQ(CONTENT_SETTING_BLOCK, 163 EXPECT_EQ(CONTENT_SETTING_BLOCK,
180 map->GetContentSetting( 164 map->GetContentSetting(
181 url, url, CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string())); 165 url, url, CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string()));
182 EXPECT_EQ(CONTENT_SETTING_BLOCK, 166 EXPECT_EQ(CONTENT_SETTING_BLOCK,
(...skipping 30 matching lines...) Expand all
213 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); 197 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
214 EXPECT_EQ(CONTENT_SETTING_ASK, 198 EXPECT_EQ(CONTENT_SETTING_ASK,
215 map->GetContentSetting( 199 map->GetContentSetting(
216 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); 200 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
217 EXPECT_EQ( 201 EXPECT_EQ(
218 CONTENT_SETTING_ASK, 202 CONTENT_SETTING_ASK,
219 map->GetContentSetting( 203 map->GetContentSetting(
220 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); 204 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
221 EXPECT_EQ(CONTENT_SETTING_ASK, 205 EXPECT_EQ(CONTENT_SETTING_ASK,
222 map->GetContentSetting( 206 map->GetContentSetting(
223 url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string()));
224 EXPECT_EQ(CONTENT_SETTING_ASK,
225 map->GetContentSetting(
226 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
227 EXPECT_EQ(CONTENT_SETTING_ASK,
228 map->GetContentSetting(
229 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 207 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
230 EXPECT_EQ(CONTENT_SETTING_ASK, 208 EXPECT_EQ(CONTENT_SETTING_ASK,
231 map->GetContentSetting( 209 map->GetContentSetting(
232 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string())); 210 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
233 EXPECT_EQ(CONTENT_SETTING_ASK, 211 EXPECT_EQ(CONTENT_SETTING_ASK,
234 map->GetContentSetting( 212 map->GetContentSetting(
235 url, url, CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string())); 213 url, url, CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string()));
236 EXPECT_EQ(CONTENT_SETTING_ASK, 214 EXPECT_EQ(CONTENT_SETTING_ASK,
237 map->GetContentSetting( 215 map->GetContentSetting(
238 url, url, CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 216 url, url, CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 << message_; 282 << message_;
305 } 283 }
306 284
307 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, 285 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
308 UnsupportedDefaultSettings) { 286 UnsupportedDefaultSettings) {
309 const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings"; 287 const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings";
310 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_; 288 EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
311 } 289 }
312 290
313 } // namespace extensions 291 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/common/extensions/api/content_settings.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698