Make CrOS proxy configuration write prefs directly.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 1460 matching lines @@
   if (chromeos::UserManager::Get()->current_user_is_owner())
     local_state->SetString(prefs::kOwnerLocale, new_locale);
   local_state->SetString(prefs::kApplicationLocale, new_locale);
 
   GetPrefs()->ScheduleSavePersistentPrefs();
   local_state->ScheduleSavePersistentPrefs();
 }
 
 chromeos::ProxyConfigServiceImpl*
     ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
-  if (!chromeos_proxy_config_service_impl_) {
-    chromeos_proxy_config_service_impl_ =
-        new chromeos::ProxyConfigServiceImpl();
+  if (!chromeos_proxy_config_service_impl_.get()) {
+    chromeos_proxy_config_service_impl_.reset(
+        new chromeos::ProxyConfigServiceImpl(g_browser_process->local_state()));
   }
-  return chromeos_proxy_config_service_impl_;
+  return chromeos_proxy_config_service_impl_.get();
 }
 
 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() {
   DCHECK(!chromeos_enterprise_extension_observer_.get());
   chromeos_enterprise_extension_observer_.reset(
       new chromeos::EnterpriseExtensionObserver(this));
 }
 
 void ProfileImpl::InitChromeOSPreferences() {
   chromeos_preferences_.reset(new chromeos::Preferences());
   chromeos_preferences_->Init(GetPrefs());
 }
 #endif  // defined(OS_CHROMEOS)
 
 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
-  if (!pref_proxy_config_tracker_)
-    pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
+  if (!pref_proxy_config_tracker_) {
+    pref_proxy_config_tracker_ =
+        new PrefProxyConfigTracker(GetPrefs(),
+                                   g_browser_process->local_state());
+  }
 
   return pref_proxy_config_tracker_;
 }
 
 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
   if (!prerender::PrerenderManager::IsPrerenderingEnabled())
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new prerender::PrerenderManager(this);
   return prerender_manager_;
 }