Make URLRequestThrottlerManager a member of URLRequestContext.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index c2700d80a7cb856ac96f151458aa793117ecf0d7..03f514d0ddfd718a9c6ba0c54371497ae83a13dd 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -119,7 +119,6 @@
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
-#include "net/url_request/url_request_throttler_manager.h"
 #include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -274,27 +273,6 @@ void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
   }
 }
 
-void InitializeURLRequestThrottlerManager(
-    const CommandLine& parsed_command_line,
-    net::NetLog* net_log) {
-  net::URLRequestThrottlerManager* manager =
-      net::URLRequestThrottlerManager::GetInstance();
-
-  // Always done in production, disabled only for unit tests.
-  manager->set_enable_thread_checks(true);
-
-  if (parsed_command_line.HasSwitch(
-          switches::kDisableExtensionsHttpThrottling)) {
-    manager->set_enforce_throttling(false);
-  }
-
-  // TODO(joi): Passing the NetLog here is temporary; once I switch the
-  // URLRequestThrottlerManager to be part of the URLRequestContext it will
-  // come from there. Doing it this way for now (2011/5/12) to try to fail
-  // fast in case A/B experiment gives unexpected results.
-  manager->set_net_log(net_log);
-}
-
 // Returns the new local state object, guaranteed non-NULL.
 PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
                                   bool is_first_run) {
@@ -1378,8 +1356,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
 #endif
 
   InitializeNetworkOptions(parsed_command_line());
-  InitializeURLRequestThrottlerManager(parsed_command_line(),
-                                       browser_process_->net_log());
 
   // Initialize histogram synchronizer system. This is a singleton and is used
   // for posting tasks via base::Bind. Its deleted when it goes out of scope.