Revert 114515 - broke CrOS tests:

chrome/browser/policy/network_configuration_updater_unittest.cc

Index: chrome/browser/policy/network_configuration_updater_unittest.cc
===================================================================
--- chrome/browser/policy/network_configuration_updater_unittest.cc	(revision 114527)
+++ chrome/browser/policy/network_configuration_updater_unittest.cc	(working copy)
@@ -26,7 +26,7 @@
 TEST_P(NetworkConfigurationUpdaterTest, InitialUpdate) {
   provider_.AddPolicy(GetParam(), Value::CreateStringValue(kFakeONC));
 
-  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, "", NULL))
+  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, ""))
       .WillRepeatedly(Return(true));
 
   NetworkConfigurationUpdater updater(&provider_, &network_library_);
@@ -37,20 +37,20 @@
   NetworkConfigurationUpdater updater(&provider_, &network_library_);
 
   // We should update if policy changes.
-  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, "", NULL))
+  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, ""))
       .WillOnce(Return(true));
   provider_.AddPolicy(GetParam(), Value::CreateStringValue(kFakeONC));
   provider_.NotifyPolicyUpdated();
   Mock::VerifyAndClearExpectations(&network_library_);
 
   // No update if the set the same value again.
-  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, "", NULL))
+  EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, ""))
       .Times(0);
   provider_.NotifyPolicyUpdated();
   Mock::VerifyAndClearExpectations(&network_library_);
 
   // Another update is expected if the policy goes away.
-  EXPECT_CALL(network_library_, LoadOncNetworks("", "", NULL))
+  EXPECT_CALL(network_library_, LoadOncNetworks("", ""))
       .WillOnce(Return(true));
   provider_.RemovePolicy(GetParam());
   provider_.NotifyPolicyUpdated();