Update from https://crrev.com/311076

net/url_request/url_request_job_manager.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_MANAGER_H_
 #define NET_URL_REQUEST_URL_REQUEST_JOB_MANAGER_H_
 
 #include <string>
-#include <vector>
 
-#include "base/synchronization/lock.h"
-#include "base/threading/platform_thread.h"
+#include "base/threading/thread_checker.h"
 #include "net/base/net_export.h"
 #include "net/url_request/url_request.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
 namespace net {
 
 // This class is responsible for managing the set of protocol factories and
 // request interceptors that determine how an URLRequestJob gets created to
 // handle an URLRequest.
@@ skipping 34 matching lines @@
 
   URLRequestJobManager();
   ~URLRequestJobManager();
 
   // The first guy to call this function sets the allowed thread.  This way we
   // avoid needing to define that thread externally.  Since we expect all
   // callers to be on the same thread, we don't worry about threads racing to
   // set the allowed thread.
   bool IsAllowedThread() const {
 #if 0
-    if (!allowed_thread_initialized_) {
-      allowed_thread_ = base::PlatformThread::CurrentId();
-      allowed_thread_initialized_ = true;
-    }
-    return allowed_thread_ == base::PlatformThread::CurrentId();
+    return thread_checker_.CalledOnValidThread();
+  }
+
+  // We use this to assert that CreateJob and the registration functions all
+  // run on the same thread.
+  base::ThreadChecker thread_checker_;
 #else
     // The previous version of this check used GetCurrentThread on Windows to
     // get thread handles to compare. Unfortunately, GetCurrentThread returns
     // a constant pseudo-handle (0xFFFFFFFE), and therefore IsAllowedThread
     // always returned true. The above code that's turned off is the correct
     // code, but causes the tree to turn red because some caller isn't
     // respecting our thread requirements. We're turning off the check for now;
     // bug http://b/issue?id=1338969 has been filed to fix things and turn the
     // check back on.
     return true;
   }
-
-  // We use this to assert that CreateJob and the registration functions all
-  // run on the same thread.
-  mutable base::PlatformThreadId allowed_thread_;
-  mutable bool allowed_thread_initialized_;
 #endif
 
-  mutable base::Lock lock_;
-
   DISALLOW_COPY_AND_ASSIGN(URLRequestJobManager);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_MANAGER_H_