Make CrOS proxy configuration write prefs directly.

chrome/browser/net/pref_proxy_config_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
@@ skipping 14 matching lines @@
       public NotificationObserver {
  public:
   // Observer interface used to send out notifications on the IO thread about
   // changes to the proxy configuration.
   class Observer {
    public:
     virtual ~Observer() {}
     virtual void OnPrefProxyConfigChanged() = 0;
   };
 
-  explicit PrefProxyConfigTracker(PrefService* pref_service);
+  // Initialize a tracker that will retrieve the configuration from
+  // |pref_service|. |fallback_pref_service| may be NULL. If specfied, it is
+  // consulted for a user pref (and only that!) if the user preference is
+  // missing in the main |pref_service|. This allows us to default the user
+  // preference to the |local_state| preference if there is no user preference
+  // for the profile.
+  PrefProxyConfigTracker(PrefService* pref_service,
+                         PrefService* fallback_pref_service);
   virtual ~PrefProxyConfigTracker();
 
   // Observer manipulation is only valid on the IO thread.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Get the proxy configuration currently defined by preferences. Writes the
   // configuration to |config| and returns true on success. |config| is not
   // touched and false is returned if there is no configuration defined. This
   // must be called on the IO thread.
@@ skipping 28 matching lines @@
   // Whether |pref_config_| is valid. Only accessed from the IO thread.
   bool valid_;
 
   // List of observers, accessed exclusively from the IO thread.
   ObserverList<Observer, true> observers_;
 
   // Pref-related members that should only be accessed from the UI thread.
   PrefService* pref_service_;
   scoped_ptr<PrefSetObserver> proxy_prefs_observer_;
 
+  // A fallback PrefSerice that is checked for user preferences if

[kuan, 2011/02/22 22:20:25]

nit: typo: PrefService

[Mattias Nissler (ping if slow), 2011/03/01 15:19:20]

Done.

+  // |pref_service| doesn't have any user preference.
+  PrefService* fallback_pref_service_;
+  scoped_ptr<PrefSetObserver> fallback_proxy_prefs_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTracker);
 };
 
 // A net::ProxyConfigService implementation that applies preference proxy
 // settings as overrides to the proxy configuration determined by a baseline
 // delegate ProxyConfigService.
 class PrefProxyConfigService
     : public net::ProxyConfigService,
       public net::ProxyConfigService::Observer,
       public PrefProxyConfigTracker::Observer {
@@ skipping 26 matching lines @@
   ObserverList<net::ProxyConfigService::Observer, true> observers_;
   scoped_refptr<PrefProxyConfigTracker> pref_config_tracker_;
 
   // Indicates whether the base service and tracker registrations are done.
   bool registered_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigService);
 };
 
 #endif  // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_