Add TaskTraits::MayBlock and TaskTraits::WithSyncPrimitives.

chrome/browser/prefs/incognito_mode_prefs.cc

Index: chrome/browser/prefs/incognito_mode_prefs.cc
diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index 8d62abaadd245f88ef5e54f031714e68845fc86e..1b021d65d0de4578a821c60a00ef8a5e02e19a81 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -75,7 +75,6 @@ class PlatformParentalControlsValue {
   static bool IsParentalControlActivityLoggingOn() {
     // Since we can potentially block, make sure the thread is okay with this.
     base::ThreadRestrictions::AssertIOAllowed();
-    base::ThreadRestrictions::AssertWaitAllowed();

[robliao, 2016/12/20 18:28:30]

Nit: This change isn't particularly topical to this CL. Move this to a separate
CL.

[fdoray, 2016/12/20 20:58:06]

Done.

 
     // Query this info on Windows 7 and above.
     if (base::win::GetVersion() < base::win::VERSION_WIN7)