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

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

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)
Patch Set: Fix more things. Created 4 years, 1 month 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
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 "chrome/browser/extensions/api/content_settings/content_settings_store. h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 kExtensionPrefsScopeRegular); 320 kExtensionPrefsScopeRegular);
321 Mock::VerifyAndClear(&observer); 321 Mock::VerifyAndClear(&observer);
322 322
323 EXPECT_EQ(CONTENT_SETTING_ALLOW, 323 EXPECT_EQ(CONTENT_SETTING_ALLOW,
324 GetContentSettingFromStore(store(), 324 GetContentSettingFromStore(store(),
325 url, 325 url,
326 url, 326 url,
327 CONTENT_SETTINGS_TYPE_COOKIES, 327 CONTENT_SETTINGS_TYPE_COOKIES,
328 std::string(), 328 std::string(),
329 false)); 329 false));
330 // The fullscreen and mouselock settings should have been ignored.
331 EXPECT_EQ(CONTENT_SETTING_DEFAULT,
332 GetContentSettingFromStore(store(),
333 url,
334 url,
335 CONTENT_SETTINGS_TYPE_FULLSCREEN,
336 std::string(),
337 false));
338 EXPECT_EQ(CONTENT_SETTING_DEFAULT,
339 GetContentSettingFromStore(store(),
340 url,
341 url,
342 CONTENT_SETTINGS_TYPE_MOUSELOCK,
343 std::string(),
344 false));
345 330
346 store()->RemoveObserver(&observer); 331 store()->RemoveObserver(&observer);
347 } 332 }
348 333
349 } // namespace extensions 334 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698