Revert 200968 "NetworkPortalDetector/NetworkStateInformer: Switc..."

Recurring interactive_ui_tests failure on debug CrOS bot:

ScreenLockerTest.TestBasic:
[19220:19220:0518/024626:1396652721:FATAL:webui_screen_locker.cc(208)] Check failed: false.
 chromeos::WebUIScreenLocker::IsSigninInProgress()
 chromeos::WebUILoginDisplay::IsSigninInProgress()
 chromeos::SigninScreenHandler::UpdateStateInternal()
 chromeos::SigninScreenHandler::UpdateState()
 chromeos::NetworkStateInformer::SendStateToObservers()
 chromeos::NetworkStateInformer::UpdateStateAndNotify()

> NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler
> 
> This removes the direct network library dependency for NetworkPortalDetector,
> NetworkStateInformer, and SigninScreenHandler. UpdateScreen and
> LocallyManagedUserCreationHandler no longer depend on NetworkLibrary as well.
>    
> Also change active -> default network in these to be consistent with
> terminology we use in NetworkStateHandler.
>    
> BUG=189093,189009
> 
> Review URL: https://chromiumcodereview.appspot.com/14134007

TBR=gauravsh@chromium.org

Review URL: https://codereview.chromium.org/15421003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201004 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index cc0c964..71ba976 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -573,12 +573,11 @@ void ProxyConfigServiceImpl::OnNetworkChanged(NetworkLibrary* network_lib,
 }
 
 // static
-bool ProxyConfigServiceImpl::ParseProxyConfig(
-    const std::string& proxy_config_string,
-    net::ProxyConfig* proxy_config) {
-  if (!proxy_config)
+bool ProxyConfigServiceImpl::ParseProxyConfig(const Network* network,
+                                              net::ProxyConfig* proxy_config) {
+  if (!network || !proxy_config)
     return false;
-  JSONStringValueSerializer serializer(proxy_config_string);
+  JSONStringValueSerializer serializer(network->proxy_config());
   scoped_ptr<Value> value(serializer.Deserialize(NULL, NULL));
   if (!value.get() || value->GetType() != Value::TYPE_DICTIONARY)
     return false;
@@ -759,7 +758,7 @@ void ProxyConfigServiceImpl::DetermineEffectiveConfig(const Network* network,
       network_availability = net::ProxyConfigService::CONFIG_VALID;
     } else if (!network->proxy_config().empty()) {
       // Network is private or shared with user using shared proxies.
-      if (ParseProxyConfig(network->proxy_config(), &network_config)) {
+      if (ParseProxyConfig(network, &network_config)) {
         VLOG(1) << this << ": using network proxy: "
                 << network->proxy_config();
         network_availability = net::ProxyConfigService::CONFIG_VALID;