Revert 114515 - broke CrOS tests:

chrome/browser/chromeos/cros/onc_network_parser_unittest.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/chromeos/cros/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
@@ skipping 245 matching lines @@
       "      \"Security\": \"WEP-PSK\","
       "      \"SSID\": \"ssid\","
       "      \"Passphrase\": \"pass\","
       "    }"
       "  }]"
       "}");
   OncNetworkParser parser(test_blob);
 
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
+  EXPECT_FALSE(parser.ParseNetwork(1));
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
   WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
   EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP);
   CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurityWep);
   EXPECT_EQ(wifi->name(), "ssid");
   CheckStringProperty(wifi, PROPERTY_INDEX_SSID, "ssid");
   EXPECT_EQ(wifi->auto_connect(), false);
@@ skipping 15 matching lines @@
       "        \"Outer\": \"PEAP\","
       "        \"UseSystemCAs\": false,"
       "      }"
       "    }"
       "  }]"
       "}");
   OncNetworkParser parser(test_blob);
 
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
+  EXPECT_FALSE(parser.ParseNetwork(1));
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
   WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
   EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
   CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x);
   EXPECT_EQ(wifi->name(), "ssid");
   EXPECT_EQ(wifi->auto_connect(), true);
   CheckBooleanProperty(wifi, PROPERTY_INDEX_AUTO_CONNECT, true);
@@ skipping 19 matching lines @@
       "        \"Password\": \"pass\","
       "        \"AnonymousIdentity\": \"anon\","
       "      }"
       "    }"
       "  }]"
       "}");
   OncNetworkParser parser(test_blob);
 
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
+  EXPECT_FALSE(parser.ParseNetwork(1));
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
   WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
   EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
   EXPECT_EQ(wifi->name(), "ssid");
   EXPECT_EQ(wifi->auto_connect(), false);
   EXPECT_EQ(wifi->eap_method(), EAP_METHOD_LEAP);
   EXPECT_EQ(wifi->eap_use_system_cas(), true);
@@ skipping 298 matching lines @@
 
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get() != NULL);
   EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
   VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
   EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type());
 }
 
 }  // namespace chromeos