Rename enterprise policy proto fields from KIOSK to RETAIL.

chrome/browser/policy/device_token_fetcher.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/policy/device_token_fetcher.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 62 matching lines @@
     NOTREACHED();
 }
 
 // Translates the DeviceRegisterResponse::DeviceMode |mode| to the enum used
 // internally to represent different device modes.
 DeviceMode TranslateProtobufDeviceMode(
     em::DeviceRegisterResponse::DeviceMode mode) {
   switch (mode) {
     case em::DeviceRegisterResponse::ENTERPRISE:
       return DEVICE_MODE_ENTERPRISE;
-    case em::DeviceRegisterResponse::KIOSK:
+    case em::DeviceRegisterResponse::RETAIL:
       return DEVICE_MODE_KIOSK;
   }
   LOG(ERROR) << "Unknown enrollment mode in registration response: " << mode;
   return  DEVICE_MODE_UNKNOWN;
 }
 
 }  // namespace
 
 DeviceTokenFetcher::DeviceTokenFetcher(
     DeviceManagementService* service,
@@ skipping 76 matching lines @@
   request_job_->SetOAuthToken(data_store_->oauth_token());
   request_job_->SetClientID(data_store_->device_id());
   em::DeviceRegisterRequest* request =
       request_job_->GetRequest()->mutable_register_request();
   request->set_type(data_store_->policy_register_type());
   if (!data_store_->machine_id().empty())
     request->set_machine_id(data_store_->machine_id());
   if (!data_store_->machine_model().empty())
     request->set_machine_model(data_store_->machine_model());
   if (data_store_->known_machine_id())
-    request->set_known_machine_id(true);
+    request->set_auto_enrolled(true);
   request_job_->Start(base::Bind(&DeviceTokenFetcher::OnTokenFetchCompleted,
                                  base::Unretained(this)));
   UMA_HISTOGRAM_ENUMERATION(kMetricToken, kMetricTokenFetchRequested,
                             kMetricTokenSize);
 }
 
 void DeviceTokenFetcher::OnTokenFetchCompleted(
     DeviceManagementStatus status,
     const em::DeviceManagementResponse& response) {
   if (status == DM_STATUS_SUCCESS && !response.has_register_response()) {
@@ skipping 156 matching lines @@
     case STATE_UNMANAGED:
     case STATE_ERROR:
     case STATE_TEMPORARY_ERROR:
     case STATE_BAD_AUTH:
       FetchTokenInternal();
       break;
   }
 }
 
 }  // namespace policy