Remove minidump analysis aides from URLRequestThrottlerManager. New

net/url_request/url_request_throttler_manager.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_THROTTLER_MANAGER_H_
 #define NET_URL_REQUEST_URL_REQUEST_THROTTLER_MANAGER_H_
+#pragma once
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
-#include "base/threading/thread_checker_impl.h"
+#include "base/threading/non_thread_safe.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_throttler_entry.h"
 
 namespace net {
 
 // Class that registers URL request throttler entries for URLs being accessed
 // in order to supervise traffic. URL requests for HTTP contents should
 // register their URLs in this manager on each request.
 //
 // URLRequestThrottlerManager maintains a map of URL IDs to URL request
 // throttler entries. It creates URL request throttler entries when new URLs
 // are registered, and does garbage collection from time to time in order to
 // clean out outdated entries. URL ID consists of lowercased scheme, host, port
 // and path. All URLs converted to the same ID will share the same entry.
-//
-// NOTE: All usage of the singleton object of this class should be on the same
-// thread.
-//
-// TODO(joi): Switch back to NonThreadSafe (and remove checks in release builds)
-// once crbug.com/71721 has been tracked down.
-class URLRequestThrottlerManager {
+class URLRequestThrottlerManager : public base::NonThreadSafe {
  public:
   static URLRequestThrottlerManager* GetInstance();
 
   // Must be called for every request, returns the URL request throttler entry
   // associated with the URL. The caller must inform this entry of some events.
   // Please refer to url_request_throttler_entry_interface.h for further
   // informations.
   scoped_refptr<URLRequestThrottlerEntryInterface> RegisterRequestUrl(
       const GURL& url);
 
@@ skipping 40 matching lines @@
   // From each URL we generate an ID composed of the scheme, host, port and path
   // that allows us to uniquely map an entry to it.
   typedef std::map<std::string, scoped_refptr<URLRequestThrottlerEntry> >
       UrlEntryMap;
 
   // Maximum number of entries that we are willing to collect in our map.
   static const unsigned int kMaximumNumberOfEntries;
   // Number of requests that will be made between garbage collection.
   static const unsigned int kRequestsBetweenCollecting;
 
-  // Constructor copies the string "MAGICZZ\0" into this buffer; using it
-  // to try to detect memory overwrites affecting url_entries_ in the wild.
-  // TODO(joi): Remove once crbug.com/71721 is figured out.
-  char magic_buffer_1_[8];
-
   // Map that contains a list of URL ID and their matching
   // URLRequestThrottlerEntry.
   UrlEntryMap url_entries_;
 
-  // Constructor copies the string "GOOGYZZ\0" into this buffer; using it
-  // to try to detect memory overwrites affecting url_entries_ in the wild.
-  // TODO(joi): Remove once crbug.com/71721 is figured out.
-  char magic_buffer_2_[8];
-
   // 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_;
 
   // Whether we would like to reject outgoing HTTP requests during the back-off
   // period.
   bool enforce_throttling_;
 
   // 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 being_tested_;
 
-  base::ThreadCheckerImpl thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(URLRequestThrottlerManager);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_THROTTLER_MANAGER_H_