Use TaskShutdownBehavior::BLOCK_SHUTDOWN in content::CreateCookieStore().

chrome/browser/sessions/better_session_restore_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 672 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(RestartTest, PRE_SessionStorage) {
   StoreDataWithPage("session_storage.html");
   Restart();
 }
 
 IN_PROC_BROWSER_TEST_F(RestartTest, SessionStorage) {
   CheckReloadedPageRestored();
 }
 
-// TODO(crbug.com/717740): This test is flaky on Mac.
-#if defined(OS_MACOSX)
-#define MAYBE_PRE_LocalStorageClearedOnExit \
-  DISABLED_PRE_LocalStorageClearedOnExit
-#else
-#define MAYBE_PRE_LocalStorageClearedOnExit PRE_LocalStorageClearedOnExit
-#endif
-IN_PROC_BROWSER_TEST_F(RestartTest, MAYBE_PRE_LocalStorageClearedOnExit) {
+IN_PROC_BROWSER_TEST_F(RestartTest, PRE_LocalStorageClearedOnExit) {
   StoreDataWithPage("local_storage.html");
   CookieSettingsFactory::GetForProfile(browser()->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   Restart();
 }
 
-// TODO(crbug.com/717740): This test is flaky on Mac.
-#if defined(OS_MACOSX)
-#define MAYBE_LocalStorageClearedOnExit DISABLED_LocalStorageClearedOnExit
-#else
-#define MAYBE_LocalStorageClearedOnExit LocalStorageClearedOnExit
-#endif
-IN_PROC_BROWSER_TEST_F(RestartTest, MAYBE_LocalStorageClearedOnExit) {
+IN_PROC_BROWSER_TEST_F(RestartTest, LocalStorageClearedOnExit) {
   CheckReloadedPageRestored();
 }
 
 IN_PROC_BROWSER_TEST_F(RestartTest, PRE_CookiesClearedOnExit) {
   StoreDataWithPage("cookies.html");
   CookieSettingsFactory::GetForProfile(browser()->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   Restart();
 }
 
@@ skipping 192 matching lines @@
   CookieSettingsFactory::GetForProfile(new_browser->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   // ... even if background mode is active.
   EnableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
   DisableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
 }