Added ConsumerManagementService class to handle enroll state and device owner info in boot lockbox.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

 // Copyright 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/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
+#include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 257 matching lines @@
   UserContext user_context(email);
   user_context.SetKey(Key(password));
   user_context.SetAuthCode(auth_code);
   Delegate()->CompleteLogin(user_context);
 }
 
 void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email,
                                             const std::string& password,
                                             bool using_saml) {
   std::string owner_email = UserManager::Get()->GetOwnerEmail();
-  if (is_enrolling_consumer_management_ && typed_email != owner_email) {
-    // Show Gaia signin page again since we only allow the owner to sign in.
-    populated_email_ = owner_email;
-    ShowGaia(is_enrolling_consumer_management_);
-    return;
+  if (is_enrolling_consumer_management_) {
+    if (typed_email == owner_email) {
+      policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process

[bartfab (slow), 2014/08/04 18:44:55]

While I was working on another screen handler last week, Nikita asked me to
factor out any new policy dependencies so that the screen handlers can easily
move to a component for Athena. I think it may be best to pass in a
policy::ConsumerManagementService* as a dependency in the constructor, and allow
it to be NULL if not used (e.g. on Athena). There will still be a dependency on
the consumer_management_service.h include but that is fine IMHO. The goal is to
make it easy to untangle the policy dependency when the time comes, not to make
it 100% nonexistent straight away.

[davidyu, 2014/08/05 07:27:00]

Done.

+          ->platform_part()->browser_policy_connector_chromeos();

[bartfab (slow), 2014/08/04 18:44:55]

Nit 1: Move the -> operator to the previous line.
Nit 2: #include "chrome/browser/browser_process_platform_part.h"

[davidyu, 2014/08/05 07:27:00]

Done.

+      connector->GetConsumerManagementService()->SetOwner(
+          owner_email,
+          base::Bind(&GaiaScreenHandler::OnSetOwnerDone,

[bartfab (slow), 2014/08/04 18:44:56]

Nit: #include "base/bind.h"

[davidyu, 2014/08/05 07:27:00]

Done.

+                     weak_factory_.GetWeakPtr(),
+                     typed_email, password, using_saml));

[bartfab (slow), 2014/08/04 18:44:55]

Nit: Add a return statement after this. That way, it becomes clear that the
method ends at the end of this conditional. It will allow you to remove the
final else in line 310.

Or, even better, restructure as:

if (is_enrolling_consumer_management_) {
  DoCompleteLogin(typed_email, password, using_saml);
  return;
}

if (typed_email == owner_email) {
  ...
  return;
}

...

[davidyu, 2014/08/05 07:27:00]

Done.

+    } else {
+      // Show Gaia signin page again since we only allow the owner to sign in.

[bartfab (slow), 2014/08/04 18:44:56]

Nit: s/signin/sign-in/

[davidyu, 2014/08/05 07:27:00]

Done.

+      populated_email_ = owner_email;
+      ShowGaia(is_enrolling_consumer_management_);
+      return;
+    }
+  } else {
+    DoCompleteLogin(typed_email, password, using_saml);
   }
+}
 
+void GaiaScreenHandler::OnSetOwnerDone(const std::string& typed_email,
+                                       const std::string& password,
+                                       bool using_saml,
+                                       bool result) {

[bartfab (slow), 2014/08/04 18:44:55]

Nit: |result| is unclear. Better call this |success|.

[davidyu, 2014/08/05 07:27:00]

Done.

+  if (!result) {
+    LOG(ERROR) << "Failed to write owner email to boot lockbox.";

[bartfab (slow), 2014/08/04 18:44:56]

Nit: s/email/e-mail/

[davidyu, 2014/08/05 07:27:00]

Done.

+    policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process
+        ->platform_part()->browser_policy_connector_chromeos();

[bartfab (slow), 2014/08/04 18:44:55]

Nit: Move the -> operator to the previous line.

[davidyu, 2014/08/05 07:27:00]

Done.

+    connector->GetConsumerManagementService()->SetEnrollState(
+        policy::ConsumerManagementService::ENROLL_BOOT_LOCKBOX_FAILED);
+  }
+  DoCompleteLogin(typed_email, password, using_saml);
+}
+
+void GaiaScreenHandler::DoCompleteLogin(const std::string& typed_email,
+                                        const std::string& password,
+                                        bool using_saml) {
   if (!Delegate())
     return;
 
   if (using_saml && !using_saml_api_)
     RecordSAMLScrapingVerificationResultInHistogram(true);
 
   const std::string sanitized_email = gaia::SanitizeEmail(typed_email);
   Delegate()->SetDisplayEmail(sanitized_email);
   UserContext user_context(sanitized_email);
   user_context.SetKey(Key(password));
@@ skipping 251 matching lines @@
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 }  // namespace chromeos