Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6848)

Unified Diff: chrome/browser/policy/network_configuration_updater_unittest.cc

Issue 8883046: Show parse errors in the UI when loading ONC files. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/network_configuration_updater_unittest.cc
===================================================================
--- chrome/browser/policy/network_configuration_updater_unittest.cc (revision 114539)
+++ chrome/browser/policy/network_configuration_updater_unittest.cc (working copy)
@@ -11,6 +11,7 @@
using testing::Mock;
using testing::Return;
+using testing::_;
namespace policy {
@@ -26,7 +27,7 @@
TEST_P(NetworkConfigurationUpdaterTest, InitialUpdate) {
provider_.AddPolicy(GetParam(), Value::CreateStringValue(kFakeONC));
- EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, ""))
+ EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, "", _))
.WillRepeatedly(Return(true));
NetworkConfigurationUpdater updater(&provider_, &network_library_);
@@ -37,20 +38,20 @@
NetworkConfigurationUpdater updater(&provider_, &network_library_);
// We should update if policy changes.
- EXPECT_CALL(network_library_, LoadOncNetworks(kFakeONC, ""))
+ 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, ""))
+ 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("", ""))
+ EXPECT_CALL(network_library_, LoadOncNetworks("", "", _))
.WillOnce(Return(true));
provider_.RemovePolicy(GetParam());
provider_.NotifyPolicyUpdated();
« no previous file with comments | « chrome/browser/policy/network_configuration_updater.cc ('k') | chrome/browser/resources/net_internals/browser_bridge.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698