Make URLRequestThrottlerManager a member of URLRequestContext.

chrome/browser/chrome_browser_main.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 100 matching lines @@
 #include "net/base/ssl_config_service.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_basic_stream.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_stream_factory.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool_manager.h"
 #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"

[eroman, 2012/04/24 19:05:57]

Can this be removed as well?

[Jói, 2012/04/27 13:20:26]

Done.

 #include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "chrome/browser/first_run/upgrade_util_linux.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 146 matching lines @@
   if (parsed_command_line.HasSwitch(switches::kTestingFixedHttpsPort)) {
     int value;
     base::StringToInt(
         parsed_command_line.GetSwitchValueASCII(
             switches::kTestingFixedHttpsPort),
         &value);
     net::HttpStreamFactory::set_testing_fixed_https_port(value);
   }
 }
 
-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) {
   FilePath local_state_path;
   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
   bool local_state_file_exists = file_util::PathExists(local_state_path);
 
   // Load local state.  This includes the application locale so we know which
   // locale dll to load.
   PrefService* local_state = g_browser_process->local_state();
@@ skipping 1018 matching lines @@
   // just changed it to include experiments.
   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
   // Set the product channel for crash reports.
   child_process_logging::SetChannel(
       chrome::VersionInfo::GetVersionStringModifier());
 #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.
   // Even though base::Bind does AddRef and Release, the object will not
   // be deleted after the Task is executed.
   histogram_synchronizer_ = new HistogramSynchronizer();
   tracking_synchronizer_ = new chrome_browser_metrics::TrackingSynchronizer();
 
   // Now that all preferences have been registered, set the install date
   // for the uninstall metrics if this is our first run. This only actually
@@ skipping 620 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }