cros: Replace "TPM" with "secure module" for machines without TPM.

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

 // Copyright 2014 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/login/supervised/supervised_user_creation_screen.h"
 
 #include <utility>
 
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/network/network_state.h"
+#include "components/login/secure_module_util.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 352 matching lines @@
 
   base::string16 title;
   base::string16 message;
   base::string16 button;
   // TODO(antrim) : find out which errors do we really have.
   // We might reuse some error messages from ordinary user flow.
   switch (code) {
     case SupervisedUserCreationController::CRYPTOHOME_NO_MOUNT:
     case SupervisedUserCreationController::CRYPTOHOME_FAILED_MOUNT:
     case SupervisedUserCreationController::CRYPTOHOME_FAILED_TPM:
-      title = l10n_util::GetStringUTF16(
-          IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
-      message = l10n_util::GetStringUTF16(
-          IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
-      button = l10n_util::GetStringUTF16(
-          IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
-      break;
+      if (::login::GetSecureModuleUsed() ==
+          ::login::SecureModuleUsed::UNQUERIED) {

[xiyuan, 2017/05/04 18:26:35]

Can we hide this inside the QuerySecureModuleUsed? That is, make it an async
query API.

e.g.
  Using GetSecureModuleUsedCallback =
      base::OnceCallback<void (SecureModuleUsed secure_module)>;
  void GetSecureModuleUsed(GetSecureModuleUsedCallback callback) {
    // If we know the result, base::ResetAndReturn(&callback).Run(known_module);
    // Otherwise, post task to a blocking pool and get reply.
    // However, BrowserThread::GetBlockingPool is deprecated.
    // The new way seems to be using 
    base::PostTaskWithTraitsAndReplyWithResult(
        FROM_HERE,
        {base::MayBlock(), base::TaskPriority::BACKGROUND,
         base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
        base::BindOnce(&GetSecureModuleInfoFromFilesAndCacheIt...),
        std::move(callback));
  }

[sammiequon, 2017/05/04 22:30:41]

Thanks, yeah I wanted to move the async in there but had some DEPS troubles with
browser_thread.h and pretty sure I did something wrong anyways so wanted your
advices :-).

+        content::BrowserThread::PostTaskAndReply(
+            content::BrowserThread::IO, FROM_HERE,

[xiyuan, 2017/05/04 18:26:35]

IO thread is actually the IPC thread. We should use blocking pool for file
access.

[sammiequon, 2017/05/04 22:30:41]

Acknowledged.

+            base::BindOnce(&::login::QuerySecureModuleUsed),
+            base::BindOnce(
+                &SupervisedUserCreationScreen::UpdateSecureModuleMessages,
+                weak_factory_.GetWeakPtr()));
+      } else {
+        UpdateSecureModuleMessages();
+      }
+      return;
     case SupervisedUserCreationController::CLOUD_SERVER_ERROR:
     case SupervisedUserCreationController::TOKEN_WRITE_FAILED:
       title = l10n_util::GetStringUTF16(
           IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE);
       message = l10n_util::GetStringUTF16(
           IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR);
       button = l10n_util::GetStringUTF16(
           IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON);
       break;
     case SupervisedUserCreationController::NO_ERROR:
@@ skipping 150 matching lines @@
 
     ui_copy->SetBoolean(kUserNeedPassword, !has_password);
     ui_copy->SetString("id", it.key());
 
     existing_users_->Set(it.key(), std::move(local_copy));
     ui_users->Append(std::move(ui_copy));
   }
   view_->ShowExistingSupervisedUsers(ui_users.get());
 }
 
+void SupervisedUserCreationScreen::UpdateSecureModuleMessages() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  base::string16 title;
+  base::string16 message;
+  base::string16 button;
+  switch (::login::GetSecureModuleUsed()) {
+    case ::login::SecureModuleUsed::TPM:
+      title =
+          l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_TPM_ERROR_TITLE);
+      message = l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_TPM_ERROR);
+      button = l10n_util::GetStringUTF16(
+          IDS_CREATE_SUPERVISED_USER_TPM_ERROR_BUTTON);
+      break;
+    case ::login::SecureModuleUsed::CR50:
+      title = l10n_util::GetStringUTF16(
+          IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_TITLE);
+      message = l10n_util::GetStringUTF16(
+          IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR);
+      button = l10n_util::GetStringUTF16(
+          IDS_CREATE_SUPERVISED_USER_SECURE_MODULE_ERROR_BUTTON);
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+  if (view_)
+    view_->ShowErrorPage(title, message, button);
+}
+
 void SupervisedUserCreationScreen::OnPhotoTaken(
     const std::string& raw_data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   user_photo_ = gfx::ImageSkia();
   ImageDecoder::Cancel(this);
   ImageDecoder::Start(this, raw_data);
 }
 
 void SupervisedUserCreationScreen::OnImageDecoded(
     const SkBitmap& decoded_image) {
@@ skipping 19 matching lines @@
     selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 }
 
 void SupervisedUserCreationScreen::OnImageAccepted() {
 }
 
 }  // namespace chromeos