Modify ThreadChecker and NonThreadSafe so that their functionality is

net/url_request/url_request_throttler_manager.cc

 // Copyright (c) 2010 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 "net/url_request/url_request_throttler_manager.h"
 
 #include <list>
 
 // TODO(joi): Remove once crbug.com/71721 is fixed.
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
   char url[256];
 
   // Not a refptr, we don't want to change behavior by keeping it alive.
   net::URLRequestThrottlerEntryInterface* entry;
 };
 
 }  // namespace
 
 namespace net {
 
-ThreadCheckerForRelease::ThreadCheckerForRelease()
-    : valid_thread_id_(base::kInvalidThreadId) {
-  EnsureThreadIdAssigned();
-}
-
-ThreadCheckerForRelease::~ThreadCheckerForRelease() {}
-
-bool ThreadCheckerForRelease::CalledOnValidThread() const {
-  EnsureThreadIdAssigned();
-  base::AutoLock auto_lock(lock_);
-  return valid_thread_id_ == base::PlatformThread::CurrentId();
-}
-
-void ThreadCheckerForRelease::DetachFromThread() {
-  base::AutoLock auto_lock(lock_);
-  valid_thread_id_ = base::kInvalidThreadId;
-}
-
-void ThreadCheckerForRelease::EnsureThreadIdAssigned() const {
-  base::AutoLock auto_lock(lock_);
-  if (valid_thread_id_ != base::kInvalidThreadId)
-    return;
-  valid_thread_id_ = base::PlatformThread::CurrentId();
-}
-
 const unsigned int URLRequestThrottlerManager::kMaximumNumberOfEntries = 1500;
 const unsigned int URLRequestThrottlerManager::kRequestsBetweenCollecting = 200;
 
 URLRequestThrottlerManager* URLRequestThrottlerManager::GetInstance() {
   return Singleton<URLRequestThrottlerManager>::get();
 }
 
 scoped_refptr<URLRequestThrottlerEntryInterface>
     URLRequestThrottlerManager::RegisterRequestUrl(const GURL &url) {
   CHECK(being_tested_ || thread_checker_.CalledOnValidThread());
@@ skipping 137 matching lines @@
 
   CHECK(nulls_found == 0);
 
   // In case something broke we want to make sure not to grow indefinitely.
   while (url_entries_.size() > kMaximumNumberOfEntries) {
     url_entries_.erase(url_entries_.begin());
   }
 }
 
 }  // namespace net