Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
index 555d18bd44bf3c2f970828bc7cd1efce4c1f2d31..f1f8cb11a8e0f3e6116dceb1884c67ce8eabd9a3 100644 |
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
@@ -740,8 +740,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, |
policies->Set( |
key::kExtensionCacheSize, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
- DecodeIntegerValue(container.extension_cache_size()).release(), |
- nullptr); |
+ DecodeIntegerValue(container.extension_cache_size()).release(), NULL); |
Thiemo Nagel
2015/09/01 17:40:36
Don't convert code from nullptr to NULL (only the
fhorschig
2015/09/04 06:53:53
Done. (FYI: These two calls of "policies->Set" are
Thiemo Nagel
2015/09/04 20:15:53
Feel free to submit a CL to convert the remaining
|
} |
} |
@@ -752,7 +751,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, |
key::kDeviceLoginScreenDomainAutoComplete, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
new base::StringValue(container.login_screen_domain_auto_complete()), |
- nullptr); |
+ NULL); |
} |
} |