Rename the ephemeral_users field in the device policy protobuf

chrome/browser/chromeos/device_settings_provider.cc

 // Copyright (c) 2012 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/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 22 matching lines @@
 namespace em = enterprise_management;
 
 namespace chromeos {
 
 namespace {
 
 const char* kBooleanSettings[] = {
   kAccountsPrefAllowNewUser,
   kAccountsPrefAllowGuest,
   kAccountsPrefShowUserNamesOnSignIn,
-  kAccountsPrefEphemeralUsers,
+  kAccountsPrefEphemeralUsersEnabled,
   kSignedDataRoamingEnabled,
   kStatsReportingPref,
   kReportDeviceVersionInfo,
   kReportDeviceActivityTimes,
   kReportDeviceBootMode
 };
 
 const char* kStringSettings[] = {
   kDeviceOwner,
   kReleaseChannel,
@@ skipping 223 matching lines @@
   } else if (prop == kAccountsPrefUsers) {
     em::UserWhitelistProto* whitelist_proto = pol.mutable_user_whitelist();
     whitelist_proto->clear_user_whitelist();
     base::ListValue& users = static_cast<base::ListValue&>(*value);
     for (base::ListValue::const_iterator i = users.begin();
          i != users.end(); ++i) {
       std::string email;
       if ((*i)->GetAsString(&email))
         whitelist_proto->add_user_whitelist(email.c_str());
     }
-  } else if (prop == kAccountsPrefEphemeralUsers) {
-    em::EphemeralUsersProto* ephemeral_users = pol.mutable_ephemeral_users();
-    bool ephemeral_users_value = false;
-    if (value->GetAsBoolean(&ephemeral_users_value))
-      ephemeral_users->set_ephemeral_users(ephemeral_users_value);
+  } else if (prop == kAccountsPrefEphemeralUsersEnabled) {
+    em::EphemeralUsersEnabledProto* ephemeral_users_enabled =
+        pol.mutable_ephemeral_users_enabled();
+    bool ephemeral_users_enabled_value = false;
+    if (value->GetAsBoolean(&ephemeral_users_enabled_value))
+      ephemeral_users_enabled->set_ephemeral_users_enabled(
+          ephemeral_users_enabled_value);
     else
       NOTREACHED();
   } else {
     // kReportDeviceVersionInfo, kReportDeviceActivityTimes, and
     // kReportDeviceBootMode do not support being set in the policy, since
     // they are not intended to be user-controlled.
     NOTREACHED();
   }
   data.set_policy_value(pol.SerializeAsString());
   // Set the cache to the updated value.
@@ skipping 42 matching lines @@
   if (data.has_username() && !data.has_request_token())
     new_values_cache.SetString(kDeviceOwner, data.username());
 
   em::ChromeDeviceSettingsProto pol;
   pol.ParseFromString(data.policy_value());
 
   // For all our boolean settings the following is applicable:
   // true is default permissive value and false is safe prohibitive value.
   // Exceptions:
   //   kSignedDataRoamingEnabled has a default value of false.
-  //   kAccountsPrefEphemeralUsers has a default value of false.
+  //   kAccountsPrefEphemeralUsersEnabled has a default value of false.
   if (pol.has_allow_new_users() &&
       pol.allow_new_users().has_allow_new_users() &&
       pol.allow_new_users().allow_new_users()) {
     // New users allowed, user_whitelist() ignored.
     new_values_cache.SetBoolean(kAccountsPrefAllowNewUser, true);
   } else if (!pol.has_user_whitelist()) {
     // If we have the allow_new_users bool, and it is true, we honor that above.
     // In all other cases (don't have it, have it and it is set to false, etc),
     // We will honor the user_whitelist() if it is there and populated.
     // Otherwise we default to allowing new users.
@@ skipping 16 matching lines @@
       !pol.show_user_names().has_show_user_names() ||
       pol.show_user_names().show_user_names());
 
   new_values_cache.SetBoolean(
       kSignedDataRoamingEnabled,
       pol.has_data_roaming_enabled() &&
       pol.data_roaming_enabled().has_data_roaming_enabled() &&
       pol.data_roaming_enabled().data_roaming_enabled());
 
   new_values_cache.SetBoolean(
-      kAccountsPrefEphemeralUsers,
-      pol.has_ephemeral_users() &&
-      pol.ephemeral_users().has_ephemeral_users() &&
-      pol.ephemeral_users().ephemeral_users());
+      kAccountsPrefEphemeralUsersEnabled,
+      pol.has_ephemeral_users_enabled() &&
+      pol.ephemeral_users_enabled().has_ephemeral_users_enabled() &&
+      pol.ephemeral_users_enabled().ephemeral_users_enabled());
 
   // TODO(cmasone): NOTIMPLEMENTED() once http://crosbug.com/13052 is fixed.
   std::string serialized;
   if (pol.has_device_proxy_settings() &&
       pol.device_proxy_settings().SerializeToString(&serialized)) {
     new_values_cache.SetString(kSettingProxyEverywhere, serialized);
   }
 
   if (!pol.has_release_channel() ||
       !pol.release_channel().has_release_channel()) {
@@ skipping 238 matching lines @@
         Reload();
         return;
       }
       LOG(ERROR) << "No retries left";
       break;
     }
   }
 }
 
 }  // namespace chromeos