Index: chrome/test/data/webui/settings/site_details_permission_tests.js |
diff --git a/chrome/test/data/webui/settings/site_details_permission_tests.js b/chrome/test/data/webui/settings/site_details_permission_tests.js |
index 58a654d0a8565e663387f1fcfbe0e2c413e368bb..0fc589c6609a510b423a6ba5b40a584345bdf6f7 100644 |
--- a/chrome/test/data/webui/settings/site_details_permission_tests.js |
+++ b/chrome/test/data/webui/settings/site_details_permission_tests.js |
@@ -92,27 +92,17 @@ suite('SiteDetailsPermission', function() { |
embeddingOrigin: '', |
}; |
- return browserProxy.whenCalled('getExceptionList') |
- .then(function() { |
- assertFalse(testElement.$.details.hidden); |
- |
- var header = testElement.$.details.querySelector('#permissionHeader'); |
- assertEquals( |
- 'Camera', header.innerText.trim(), |
- 'Widget should be labelled correctly'); |
- |
- // Flip the permission and validate that prefs stay in sync. |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.ALLOW); |
- }) |
- .then(function() { |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.BLOCK); |
- }) |
- .then(function() { |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.ALLOW); |
- }); |
+ assertFalse(testElement.$.details.hidden); |
+ |
+ var header = testElement.$.details.querySelector('#permissionHeader'); |
+ assertEquals( |
+ 'Camera', header.innerText.trim(), |
+ 'Widget should be labelled correctly'); |
+ |
+ // Flip the permission and validate that prefs stay in sync. |
tsergeant
2017/06/21 01:49:56
As in old version of the test, you need promises h
Patti Lor
2017/06/21 06:36:37
Thanks Tim! Fixed.
|
+ validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
+ validatePermissionFlipWorks(origin, settings.PermissionValues.BLOCK); |
+ validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
}); |
test('cookies category', function() { |
@@ -125,26 +115,16 @@ suite('SiteDetailsPermission', function() { |
embeddingOrigin: '', |
}; |
- return browserProxy.whenCalled('getExceptionList') |
- .then(function() { |
- assertFalse(testElement.$.details.hidden); |
- |
- var header = testElement.$.details.querySelector('#permissionHeader'); |
- assertEquals( |
- 'Cookies', header.innerText.trim(), |
- 'Widget should be labelled correctly'); |
- |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.SESSION_ONLY); |
- }) |
- .then(function() { |
- // Flip the permission and validate that prefs stay in sync. |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.ALLOW); |
- }) |
- .then(function() { |
- return validatePermissionFlipWorks( |
- origin, settings.PermissionValues.BLOCK); |
- }); |
+ assertFalse(testElement.$.details.hidden); |
+ |
+ var header = testElement.$.details.querySelector('#permissionHeader'); |
+ assertEquals( |
+ 'Cookies', header.innerText.trim(), |
+ 'Widget should be labelled correctly'); |
+ |
+ // Flip the permission and validate that prefs stay in sync. |
tsergeant
2017/06/21 01:49:56
As above, use promises here too.
Patti Lor
2017/06/21 06:36:37
Done.
|
+ validatePermissionFlipWorks(origin, settings.PermissionValues.SESSION_ONLY); |
+ validatePermissionFlipWorks(origin, settings.PermissionValues.ALLOW); |
+ validatePermissionFlipWorks(origin, settings.PermissionValues.BLOCK); |
}); |
}); |