Minor fixes in proxy configuration on iOS.

chrome/browser/net/pref_proxy_config_tracker_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/net/pref_proxy_config_tracker_impl.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
@@ skipping 296 matching lines @@
     }
     if (update_pending_)
       OnProxyConfigChanged(config_state, new_config);
   } else {
     NOTREACHED() << "Unexpected notification of type " << type;
   }
 }
 
 ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig(
     net::ProxyConfig* config) {
-#if defined(OS_IOS)
-  return ProxyPrefs::CONFIG_UNSET;
-#else
-
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Clear the configuration and source.
   *config = net::ProxyConfig();
   ProxyPrefs::ConfigState config_state = ProxyPrefs::CONFIG_UNSET;
 
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kProxy);
   DCHECK(pref);
 
   const DictionaryValue* dict = pref_service_->GetDictionary(prefs::kProxy);
   DCHECK(dict);
   ProxyConfigDictionary proxy_dict(dict);
 
   if (PrefConfigToNetConfig(proxy_dict, config)) {
     if (!pref->IsUserModifiable() || pref->HasUserSetting()) {
       if (pref->IsManaged())
         config_state = ProxyPrefs::CONFIG_POLICY;
       else if (pref->IsExtensionControlled())
         config_state = ProxyPrefs::CONFIG_EXTENSION;
       else
         config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
     } else  {
       config_state = ProxyPrefs::CONFIG_FALLBACK;
     }
   }
 
   return config_state;
-#endif  // defined(OS_IOS)
 }