Add TaskTraits::MayBlock and TaskTraits::WithSyncPrimitives.

chrome/browser/prefs/incognito_mode_prefs.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 "chrome/browser/prefs/incognito_mode_prefs.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
       : is_enabled_(IsParentalControlActivityLoggingOn()) {}
 
   ~PlatformParentalControlsValue() = default;
 
   // Returns true if Windows Parental control activity logging is enabled. This
   // feature is available on Windows 7 and beyond. This function should be
   // called on a COM Initialized thread and is potentially blocking.
   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)
       return false;
 
     ThreadType thread_type = ThreadType::BLOCKING;
     if (BrowserThread::IsThreadInitialized(BrowserThread::UI) &&
         content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       thread_type = ThreadType::UI;
     }
@@ skipping 138 matching lines @@
   bool valid = IntToAvailability(pref_value, &result);
   DCHECK(valid);
   if (result != IncognitoModePrefs::DISABLED &&
       mode == CHECK_PARENTAL_CONTROLS && ArePlatformParentalControlsEnabled()) {
     if (result == IncognitoModePrefs::FORCED)
       LOG(ERROR) << "Ignoring FORCED incognito. Parental control logging on";
     return IncognitoModePrefs::DISABLED;
   }
   return result;
 }