summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 17:37:41 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 17:37:41 +0000
commit12be5562c0cde463bc0b84019cd28732214fc16a (patch)
treeeeab5e928115eec55b16a8852fcf475c4617d4f5
parentb7494739bb77726c4fe4098ca9ca65e8559b41f9 (diff)
downloadchromium_src-12be5562c0cde463bc0b84019cd28732214fc16a.zip
chromium_src-12be5562c0cde463bc0b84019cd28732214fc16a.tar.gz
chromium_src-12be5562c0cde463bc0b84019cd28732214fc16a.tar.bz2
Disable NetworkDelayListener because it creates too long delays during session restart
BUG=111375 TEST=no Review URL: https://chromiumcodereview.appspot.com/9271045 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@119251 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_process_impl.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index f25e9f7..06df692 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -27,7 +27,6 @@
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/extensions/extension_event_router_forwarder.h"
#include "chrome/browser/extensions/extension_tab_id_map.h"
-#include "chrome/browser/extensions/network_delay_listener.h"
#include "chrome/browser/extensions/user_script_listener.h"
#include "chrome/browser/first_run/upgrade_util.h"
#include "chrome/browser/google/google_url_tracker.h"
@@ -720,10 +719,9 @@ void BrowserProcessImpl::CreateResourceDispatcherHost() {
resource_dispatcher_host_.get() == NULL);
created_resource_dispatcher_host_ = true;
- // UserScriptListener and NetworkDelayListener will delete themselves.
+ // UserScriptListener will delete itself.
ResourceQueue::DelegateSet resource_queue_delegates;
resource_queue_delegates.insert(new UserScriptListener());
- resource_queue_delegates.insert(new NetworkDelayListener());
resource_dispatcher_host_.reset(
new ResourceDispatcherHost(resource_queue_delegates));