Fix and enable SiteSettingsTest#testSiteExceptionCookiesBlocked

Close settings activity before loading a URL to try to avoid
flakiness.

Bug: 1139480
Change-Id: I4e9b617941f07fc3baa313ddf10b6c9cb656990c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526341Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Ehimare Okoyomon <eokoyomon@chromium.org>
Reviewed-by: Andy Paicu <andypaicu@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825743}

chrome/android/javatests/src/org/chromium/chrome/browser/site_settings/SiteSettingsTest.java

@@ -415,10 +415,7 @@ public class SiteSettingsTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    // Todo(eokoyomon) figure out how to set and test third party cookie setting in this test
-    // @EnableFeatures(
-    //         ContentSettingsFeatureList.IMPROVED_COOKIE_CONTROLS_FOR_THIRD_PARTY_COOKIE_BLOCKING)
-    @FlakyTest(message = "https://crbug.com/1139480")
+    // TODO(eokoyomon) figure out how to set and test third party cookie setting in this test
     public void testSiteExceptionCookiesBlocked() throws Exception {
         SettingsActivity settingsActivity =
                 SiteSettingsTestUtils.startSiteSettingsCategory(SiteSettingsCategory.Type.COOKIES);
@@ -443,14 +440,13 @@ public class SiteSettingsTest {
         settingsActivity =
                 SiteSettingsTestUtils.startSiteSettingsCategory(SiteSettingsCategory.Type.COOKIES);
         setBlockCookiesSiteException(settingsActivity, url, false);
+        settingsActivity.finish();
         mPermissionRule.runJavaScriptCodeInCurrentTab("setCookie()");
         Assert.assertEquals("\"\"", mPermissionRule.runJavaScriptCodeInCurrentTab("getCookie()"));
 
         // Load the page again and ensure the cookie remains unset.
         mPermissionRule.loadUrl(url);
         Assert.assertEquals("\"\"", mPermissionRule.runJavaScriptCodeInCurrentTab("getCookie()"));
-
-        settingsActivity.finish();
     }
 
     /**