Extended: Add "system" URLRequestContext

chrome/browser/chromeos/proxy_cros_settings_provider.cc

Index: chrome/browser/chromeos/proxy_cros_settings_provider.cc
diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.cc b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
index 78489a10bc801842e28c6074d15b7e62caf47a62..1596769842a8470cb6a98cf76e92a16886732610 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_provider.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"

[Mattias Nissler (ping if slow), 2011/03/09 11:04:56]

please remove the profile-related includes.

[battre, 2011/03/09 19:24:07]

Done.

 #include "chrome/common/chrome_switches.h"
@@ -292,12 +293,7 @@ bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) {
 
 chromeos::ProxyConfigServiceImpl*
     ProxyCrosSettingsProvider::GetConfigService() const {
-  Browser* browser = BrowserList::GetLastActive();
-  // browser is NULL at OOBE/login stage.
-  Profile* profile = browser ?
-      browser->profile() :
-      ProfileManager::GetDefaultProfile();
-  return profile->GetChromeOSProxyConfigServiceImpl();
+  return g_browser_process->chromeos_proxy_config_service_impl();
 }
 
 void ProxyCrosSettingsProvider::AppendPortIfValid(