diff options
5 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/policy/device_token_fetcher.cc b/chrome/browser/policy/device_token_fetcher.cc index 22ca50d..64eb204 100644 --- a/chrome/browser/policy/device_token_fetcher.cc +++ b/chrome/browser/policy/device_token_fetcher.cc @@ -80,7 +80,7 @@ DeviceMode TranslateProtobufDeviceMode( 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; @@ -177,7 +177,7 @@ void DeviceTokenFetcher::FetchTokenInternal() { 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, diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc index 00c019e..656185d 100644 --- a/chrome/browser/policy/device_token_fetcher_unittest.cc +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc @@ -34,10 +34,10 @@ ACTION_P(VerifyRegisterRequest, known_machine_id) { const em::DeviceRegisterRequest& request = arg0->GetRequest()->register_request(); if (known_machine_id) { - EXPECT_TRUE(request.has_known_machine_id()); - EXPECT_TRUE(request.known_machine_id()); + EXPECT_TRUE(request.has_auto_enrolled()); + EXPECT_TRUE(request.auto_enrolled()); } else { - EXPECT_FALSE(request.has_known_machine_id()); + EXPECT_FALSE(request.has_auto_enrolled()); } } diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto index 501bee7..0773f37 100644 --- a/chrome/browser/policy/proto/chrome_device_policy.proto +++ b/chrome/browser/policy/proto/chrome_device_policy.proto @@ -130,7 +130,7 @@ message ForcedLogoutTimeoutsProto { message ScreenSaverProto { // Specifies the extension ID which is to be used as a screen saver on the // login screen if no user activity is present. Only respected if the device - // is in KIOSK mode. + // is in RETAIL mode. optional string screen_saver_extension_id = 1; // Specifies the timeout before the screen saver is activated. If this field @@ -162,7 +162,7 @@ message AutoUpdateSettingsProto { message StartUpUrlsProto { // Specifies the URLs to be loaded on login to the anonymous account used if - // the device is in KIOSK mode. + // the device is in RETAIL mode. repeated string start_up_urls = 1; } diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto index 9db8cc9..b6396020 100644 --- a/chrome/browser/policy/proto/device_management_backend.proto +++ b/chrome/browser/policy/proto/device_management_backend.proto @@ -38,11 +38,11 @@ message DeviceRegisterRequest { // "Android", or "Chrome OS". optional string machine_model = 4; - // When true, indicates that the |machine_id| field should be known to the - // server. The server can do additional checks based on this information. - // This is currently used for requests triggered by auto-enrollment. + // When true, indicates that the |machine_id| has been identified as auto- + // enrollment candidate on the client and the server can use it to verify + // that the client is to be enrolled in the correct mode. // Defaults to false when not present. - optional bool known_machine_id = 5; + optional bool auto_enrolled = 5; } // Response from server to device register request. @@ -64,10 +64,10 @@ message DeviceRegisterResponse { // controlled through the cloud policy infrastructure. Auto-enrollment is // supported in that mode. ENTERPRISE = 0; - // Devices in KIOSK mode also have no local owner and get their device + // Devices in RETAIL mode also have no local owner and get their device // settings from the cloud, but additionally this mode enables the demo // account on the device. - KIOSK = 1; + RETAIL = 1; } optional DeviceMode enrollment_type = 3 [default = ENTERPRISE]; } diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index a7d16ff..22f34bc 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -619,7 +619,7 @@ class TestServer(object): dm.DeviceRegisterRequest.TT: ['google/chromeos/user'], } if machine_id in KIOSK_MACHINE_IDS: - enrollment_mode = dm.DeviceRegisterResponse.KIOSK + enrollment_mode = dm.DeviceRegisterResponse.RETAIL else: enrollment_mode = dm.DeviceRegisterResponse.ENTERPRISE self._registered_tokens[dmtoken] = { |