Revert 212129 "Cleaning up TODO(joi) entries in //net."

trunk/src/net/url_request/url_request_throttler_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_THROTTLER_MANAGER_H_
 #define NET_URL_REQUEST_URL_REQUEST_THROTTLER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 45 matching lines @@
   // any) for the URL. The service will hold a reference to the entry.
   // It is only used by unit tests.
   void OverrideEntryForTests(const GURL& url, URLRequestThrottlerEntry* entry);
 
   // Explicitly erases an entry.
   // This is useful to remove those entries which have got infinite lifetime and
   // thus won't be garbage collected.
   // It is only used by unit tests.
   void EraseEntryForTests(const GURL& url);
 
+  // Turns threading model verification on or off.  Any code that correctly
+  // uses the network stack should preferably call this function to enable
+  // verification of correct adherence to the network stack threading model.
+  void set_enable_thread_checks(bool enable);
+  bool enable_thread_checks() const;
+
   // Whether throttling is enabled or not.
   void set_enforce_throttling(bool enforce);
   bool enforce_throttling();
 
   // Sets the NetLog instance to use.
   void set_net_log(NetLog* net_log);
   NetLog* net_log() const;
 
   // IPAddressObserver interface.
   virtual void OnIPAddressChanged() OVERRIDE;
@@ skipping 51 matching lines @@
   // Set of hosts that have opted out.
   OptOutHosts opt_out_hosts_;
 
   // This keeps track of how many requests have been made. Used with
   // GarbageCollectEntries.
   unsigned int requests_since_last_gc_;
 
   // Valid after construction.
   GURL::Replacements url_id_replacements_;
 
+  // Certain tests do not obey the net component's threading policy, so we
+  // keep track of whether we're being used by tests, and turn off certain
+  // checks.
+  //
+  // TODO(joi): See if we can fix the offending unit tests and remove this
+  // workaround.
+  bool enable_thread_checks_;
+
   // Initially false, switches to true once we have logged because of back-off
   // being disabled for localhost.
   bool logged_for_localhost_disabled_;
 
   // NetLog to use, if configured.
   BoundNetLog net_log_;
 
   // Valid once we've registered for network notifications.
   base::PlatformThreadId registered_from_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestThrottlerManager);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_THROTTLER_MANAGER_H_