Extended: Add "system" URLRequestContext

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a3a498f36311f29e47e25a2f87314491e81ec7af..b9f100405044449ff1e597d2349f1b711db2a4e5 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -78,8 +78,10 @@
 namespace browser {
 
 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
-  RegisterLocalState(local_state);
-  RegisterUserPrefs(user_prefs);
+  if (local_state)
+    RegisterLocalState(local_state);
+  if (user_prefs)
+    RegisterUserPrefs(user_prefs);
 }
 
 void RegisterLocalState(PrefService* local_state) {
@@ -104,6 +106,7 @@ void RegisterLocalState(PrefService* local_state) {
   AutoFillManager::RegisterBrowserPrefs(local_state);
   BackgroundPageTracker::RegisterPrefs(local_state);
   NotificationUIManager::RegisterPrefs(local_state);
+  PrefProxyConfigService::RegisterUserPrefs(local_state);
 #if defined(OS_CHROMEOS)
   chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
   chromeos::UserManager::RegisterPrefs(local_state);