Check in patch for pierre.lafayette, http://codereview.chromium.org/178059/sh...

chrome/browser/browser_init.cc

 // Copyright (c) 2006-2008 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/browser_init.h"
 
 #include <algorithm>
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
@@ skipping 39 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #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)
 #include "base/win_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/views/tabs/tab_overview_message_listener.h"
 #endif
@@ skipping 752 matching lines @@
     FilePath path = FilePath::FromWStringHack(path_string);
     profile->GetExtensionsService()->InstallExtension(path);
 
     // If the chrome process was already running, install the extension without
     // popping up another browser window.
     silent_launch = !process_startup;
   }
 
   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
   // of an automation request), we are done here.
   if (!silent_launch) {
     return LaunchBrowser(command_line, profile, cur_dir, process_startup,
                          return_code, browser_init);
   }
   return true;
 }
 
 template <class AutomationProviderClass>
 void BrowserInit::CreateAutomationProvider(const std::string& channel_id,
                                            Profile* profile,
                                            size_t expected_tabs) {
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }