Correctly update gconf proxy settings on Linux.

net/proxy/proxy_config_service_linux.cc

 // Copyright (c) 2009 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 "net/proxy/proxy_config_service_linux.h"
 
 #include <gconf/gconf-client.h>
 #include <stdlib.h>
 
 #include "base/logging.h"
@@ skipping 494 matching lines @@
 }
 
 void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig(
     MessageLoop* glib_default_loop, MessageLoop* io_loop) {
   // We should be running on the default glib main loop thread right
   // now. gconf can only be accessed from this thread.
   DCHECK(MessageLoop::current() == glib_default_loop);
   glib_default_loop_ = glib_default_loop;
   io_loop_ = io_loop;
 
-  // If we are passed a NULL io_loop, then we don't setup gconf
+  // If we are passed a NULL io_loop, then we don't set up gconf
   // notifications. This should not be the usual case but is intended
   // to simplify test setups.
   if (!io_loop_)
     LOG(INFO) << "Monitoring of gconf setting changes is disabled";
 
   // Fetch and cache the current proxy config. The config is left in
   // cached_config_, where GetProxyConfig() running on the IO thread
   // will expect to find it. This is safe to do because we return
   // before this ProxyConfigServiceLinux is passed on to
   // the ProxyService.
@@ skipping 79 matching lines @@
   if (new_config.is_valid() != reference_config_.is_valid() ||
       !new_config.Equals(reference_config_)) {
     // Post a task to |io_loop| with the new configuration, so it can
     // update |cached_config_|.
     io_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(
             this,
             &ProxyConfigServiceLinux::Delegate::SetNewProxyConfig,
             new_config));
+    // Update the thread-private copy in |reference_config_| as well.
+    reference_config_ = new_config;
   }
 }
 
 void ProxyConfigServiceLinux::Delegate::SetNewProxyConfig(
     const ProxyConfig& new_config) {
   DCHECK(MessageLoop::current() == io_loop_);
   LOG(INFO) << "Proxy configuration changed";
   cached_config_ = new_config;
 }
 
@@ skipping 23 matching lines @@
                              new GConfSettingGetterImpl())) {
 }
 
 ProxyConfigServiceLinux::ProxyConfigServiceLinux(
     base::EnvironmentVariableGetter* env_var_getter,
     GConfSettingGetter* gconf_getter)
     : delegate_(new Delegate(env_var_getter, gconf_getter)) {
 }
 
 }  // namespace net