Clean up device policy definitions.

chrome/browser/chromeos/policy/device_local_account.cc

 // Copyright (c) 2013 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/policy/device_local_account.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace policy {
 
 namespace {
 
 const char kPublicAccountDomainPrefix[] = "public-accounts";
 const char kKioskAppAccountDomainPrefix[] = "kiosk-apps";
 const char kDeviceLocalAccountDomainSuffix[] = ".device-local.localhost";
 
 }  // namespace
 
 DeviceLocalAccount::DeviceLocalAccount(Type type,
                                        const std::string& account_id,
-                                       const std::string& kiosk_app_id,
-                                       const std::string& kiosk_app_update_url)
+                                       const std::string& kiosk_app_id)
     : type(type),
       account_id(account_id),
       user_id(GenerateDeviceLocalAccountUserId(account_id, type)),
-      kiosk_app_id(kiosk_app_id),
-      kiosk_app_update_url(kiosk_app_update_url) {
+      kiosk_app_id(kiosk_app_id) {
 }
 
 DeviceLocalAccount::~DeviceLocalAccount() {
 }
 
 std::string GenerateDeviceLocalAccountUserId(const std::string& account_id,
                                              DeviceLocalAccount::Type type) {
   std::string domain_prefix;
   switch (type) {
     case DeviceLocalAccount::TYPE_PUBLIC_SESSION:
@@ skipping 33 matching lines @@
     entry->SetStringWithoutPathExpansion(
         chromeos::kAccountsPrefDeviceLocalAccountsKeyId,
         it->account_id);
     entry->SetIntegerWithoutPathExpansion(
         chromeos::kAccountsPrefDeviceLocalAccountsKeyType,
         it->type);
     if (it->type == DeviceLocalAccount::TYPE_KIOSK_APP) {
       entry->SetStringWithoutPathExpansion(
           chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
           it->kiosk_app_id);
-      if (!it->kiosk_app_update_url.empty()) {
-        entry->SetStringWithoutPathExpansion(
-            chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
-            it->kiosk_app_update_url);
-      }
     }
     list.Append(entry.release());
   }
 
   cros_settings->Set(chromeos::kAccountsPrefDeviceLocalAccounts, list);
 }
 
 std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
     chromeos::CrosSettings* cros_settings) {
   std::vector<DeviceLocalAccount> accounts;
@@ skipping 24 matching lines @@
     int type;
     if (!entry->GetIntegerWithoutPathExpansion(
             chromeos::kAccountsPrefDeviceLocalAccountsKeyType, &type) ||
         type < 0 || type >= DeviceLocalAccount::TYPE_COUNT) {
       LOG(ERROR) << "Missing or invalid account type in device-local account "
                  << "list at index " << i << ".";
       continue;
     }
 
     std::string kiosk_app_id;
-    std::string kiosk_app_update_url;
     if (type == DeviceLocalAccount::TYPE_KIOSK_APP) {
       if (!entry->GetStringWithoutPathExpansion(
               chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
               &kiosk_app_id)) {
         LOG(ERROR) << "Missing app ID in device-local account entry at index "
                    << i << ".";
         continue;
       }
-      entry->GetStringWithoutPathExpansion(
-          chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
-          &kiosk_app_update_url);
     }
 
     if (!account_ids.insert(account_id).second) {
       LOG(ERROR) << "Duplicate entry in device-local account list at index "
                  << i << ": " << account_id << ".";
       continue;
     }
 
     accounts.push_back(DeviceLocalAccount(
-        static_cast<DeviceLocalAccount::Type>(type),
-        account_id, kiosk_app_id, kiosk_app_update_url));
+        static_cast<DeviceLocalAccount::Type>(type), account_id, kiosk_app_id));
   }
   return accounts;
 }
 
 }  // namespace policy