Commit 17f321cb authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Demo mode: Add debug logs to demo mode setup.

Logging demo setup steps will help to determine at what point problems
occured for example in case of infinite loading.

Change-Id: I04725e4c9d0de12553f6f14fb3d8ee7d106e9699
Reviewed-on: https://chromium-review.googlesource.com/c/1277957Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599088}
parent 9a4699db
...@@ -186,7 +186,7 @@ void DemoSetupController::Enroll(OnSetupSuccess on_setup_success, ...@@ -186,7 +186,7 @@ void DemoSetupController::Enroll(OnSetupSuccess on_setup_success,
on_setup_success_ = std::move(on_setup_success); on_setup_success_ = std::move(on_setup_success);
on_setup_error_ = std::move(on_setup_error); on_setup_error_ = std::move(on_setup_error);
VLOG(1) << "Starting demo mode enrollment " VLOG(1) << "Starting demo setup "
<< DemoSession::DemoConfigToString(demo_config_); << DemoSession::DemoConfigToString(demo_config_);
switch (demo_config_) { switch (demo_config_) {
...@@ -206,6 +206,7 @@ void DemoSetupController::Enroll(OnSetupSuccess on_setup_success, ...@@ -206,6 +206,7 @@ void DemoSetupController::Enroll(OnSetupSuccess on_setup_success,
} }
void DemoSetupController::LoadDemoResourcesCrOSComponent() { void DemoSetupController::LoadDemoResourcesCrOSComponent() {
VLOG(1) << "Loading demo resources component";
component_updater::CrOSComponentManager* cros_component_manager = component_updater::CrOSComponentManager* cros_component_manager =
g_browser_process->platform_part()->cros_component_manager(); g_browser_process->platform_part()->cros_component_manager();
// In tests, use the desired error code. // In tests, use the desired error code.
...@@ -238,6 +239,7 @@ void DemoSetupController::OnDemoResourcesCrOSComponentLoaded( ...@@ -238,6 +239,7 @@ void DemoSetupController::OnDemoResourcesCrOSComponentLoaded(
return; return;
} }
VLOG(1) << "Starting online enrollment";
policy::DeviceCloudPolicyManagerChromeOS* policy_manager = policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
g_browser_process->platform_part() g_browser_process->platform_part()
->browser_policy_connector_chromeos() ->browser_policy_connector_chromeos()
...@@ -266,6 +268,7 @@ void DemoSetupController::EnrollOffline(const base::FilePath& policy_dir) { ...@@ -266,6 +268,7 @@ void DemoSetupController::EnrollOffline(const base::FilePath& policy_dir) {
return; return;
} }
VLOG(1) << "Checking if offline policy exists";
std::string* message = new std::string(); std::string* message = new std::string();
base::PostTaskWithTraitsAndReplyWithResult( base::PostTaskWithTraitsAndReplyWithResult(
FROM_HERE, FROM_HERE,
...@@ -285,6 +288,7 @@ void DemoSetupController::OnOfflinePolicyFilesExisted(std::string* message, ...@@ -285,6 +288,7 @@ void DemoSetupController::OnOfflinePolicyFilesExisted(std::string* message,
return; return;
} }
VLOG(1) << "Starting offline enrollment";
policy::EnrollmentConfig config; policy::EnrollmentConfig config;
config.mode = policy::EnrollmentConfig::MODE_OFFLINE_DEMO; config.mode = policy::EnrollmentConfig::MODE_OFFLINE_DEMO;
config.management_domain = DemoSetupController::kDemoModeDomain; config.management_domain = DemoSetupController::kDemoModeDomain;
...@@ -323,6 +327,7 @@ void DemoSetupController::OnDeviceEnrolled( ...@@ -323,6 +327,7 @@ void DemoSetupController::OnDeviceEnrolled(
// Try to load the policy for the device local account. // Try to load the policy for the device local account.
if (demo_config_ == DemoSession::DemoModeConfig::kOffline) { if (demo_config_ == DemoSession::DemoModeConfig::kOffline) {
VLOG(1) << "Loading offline policy";
DCHECK(!policy_dir_.empty()); DCHECK(!policy_dir_.empty());
const base::FilePath file_path = const base::FilePath file_path =
policy_dir_.AppendASCII(kOfflineDeviceLocalAccountPolicyFileName); policy_dir_.AppendASCII(kOfflineDeviceLocalAccountPolicyFileName);
...@@ -334,7 +339,7 @@ void DemoSetupController::OnDeviceEnrolled( ...@@ -334,7 +339,7 @@ void DemoSetupController::OnDeviceEnrolled(
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
return; return;
} }
VLOG(1) << "Marking device registered";
StartupUtils::MarkDeviceRegistered( StartupUtils::MarkDeviceRegistered(
base::BindOnce(&DemoSetupController::OnDeviceRegistered, base::BindOnce(&DemoSetupController::OnDeviceRegistered,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
...@@ -394,6 +399,7 @@ void DemoSetupController::OnDeviceLocalAccountPolicyLoaded( ...@@ -394,6 +399,7 @@ void DemoSetupController::OnDeviceLocalAccountPolicyLoaded(
return; return;
} }
VLOG(1) << "Storing offline policy";
// On the unittest, the device_local_account_policy_store_ is already // On the unittest, the device_local_account_policy_store_ is already
// initialized. Otherwise attempts to get the store. // initialized. Otherwise attempts to get the store.
if (!device_local_account_policy_store_) { if (!device_local_account_policy_store_) {
...@@ -449,6 +455,7 @@ void DemoSetupController::Reset() { ...@@ -449,6 +455,7 @@ void DemoSetupController::Reset() {
void DemoSetupController::OnStoreLoaded(policy::CloudPolicyStore* store) { void DemoSetupController::OnStoreLoaded(policy::CloudPolicyStore* store) {
DCHECK_EQ(store, device_local_account_policy_store_); DCHECK_EQ(store, device_local_account_policy_store_);
VLOG(1) << "Marking device registered";
StartupUtils::MarkDeviceRegistered( StartupUtils::MarkDeviceRegistered(
base::BindOnce(&DemoSetupController::OnDeviceRegistered, base::BindOnce(&DemoSetupController::OnDeviceRegistered,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment