summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 17:01:16 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 17:01:16 +0000
commitd95fa1894447a1b5b96c482f4bb0290e9983636b (patch)
treef3f5c5af88598d5c3ccfcec0dc88d089a7a14a42 /chrome/browser
parentc0553245c3c5548b52055ff353401fd82a4e0892 (diff)
downloadchromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.zip
chromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.tar.gz
chromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.tar.bz2
Check in patch for pierre.lafayette, http://codereview.chromium.org/178059/show.
Review URL: http://codereview.chromium.org/194057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_init.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 2d87070..78b6fb6 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -57,7 +57,7 @@
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/theme_resources.h"
-#include "net/url_request/url_request_http_job.h"
+#include "net/base/net_util.h"
#include "webkit/glue/webkit_glue.h"
#if defined(OS_WIN)
@@ -830,8 +830,8 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) {
std::wstring allowed_ports =
- command_line.GetSwitchValue(switches::kExplicitlyAllowedPorts);
- URLRequestHttpJob::SetExplicitlyAllowedPorts(allowed_ports);
+ command_line.GetSwitchValue(switches::kExplicitlyAllowedPorts);
+ net::SetExplicitlyAllowedPorts(allowed_ports);
}
// If we don't want to launch a new browser window or tab (in the case