Rewrite of the EnrollEnterpriseDevice PyAuto automation hook for WebUI.

chrome/browser/automation/testing_automation_provider_chromeos.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/automation/testing_automation_provider.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 906 matching lines @@
       g_browser_process->browser_policy_connector();
   if (!connector) {
     reply.SendError("Unable to access BrowserPolicyConnector");
     return;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->SetBoolean("enterprise", connector->IsEnterpriseManaged());
   reply.SendSuccess(return_value.get());
 }
 
-void TestingAutomationProvider::EnrollEnterpriseDevice(
+void TestingAutomationProvider::ShowEnterpriseWizard(
     DictionaryValue* args, IPC::Message* reply_message) {
-  std::string user, password;
-  if (!args->GetString("user", &user) ||
-      !args->GetString("password", &password)) {
-    AutomationJSONReply(this, reply_message)
-        .SendError("Invalid or missing args.");
-    return;
-  }
+  AutomationJSONReply reply(this, reply_message);
   chromeos::ExistingUserController* user_controller =
       chromeos::ExistingUserController::current_controller();
   if (!user_controller) {
-    AutomationJSONReply(this, reply_message).SendError(
-        "Unable to access ExistingUserController");
+    reply.SendError("Unable to access ExistingUserController");
     return;
   }
   user_controller->login_display_host()->StartWizard(
       chromeos::WizardController::kEnterpriseEnrollmentScreenName,
       NULL);
   chromeos::WizardController* wizard_controller =
       chromeos::WizardController::default_controller();
   if (!wizard_controller) {
+    reply.SendError("Unable to access WizardController");
+    return;
+  }
+  chromeos::EnterpriseEnrollmentScreen* enroll_screen =
+      wizard_controller->GetEnterpriseEnrollmentScreen();
+  if (!enroll_screen) {
+    reply.SendError("Unable to access EnterpriseEnrollmentScreen");
+    return;
+  }

[Mattias Nissler (ping if slow), 2012/05/25 13:17:22]

The steps for getting the enrollment screen are now duplicated. Move to a helper
function?

[craigdh, 2012/05/25 23:24:47]

Done.

+  enroll_screen->GetActor()->Show();
+  reply.SendSuccess(NULL);
+}
+
+void TestingAutomationProvider::AddEnrollmentObserver(
+    DictionaryValue* args, IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
+  chromeos::WizardController* wizard_controller =
+      chromeos::WizardController::default_controller();
+  if (!wizard_controller) {
     AutomationJSONReply(this, reply_message).SendError(
         "Unable to access WizardController");
     return;
   }
   chromeos::EnterpriseEnrollmentScreen* enroll_screen =
       wizard_controller->GetEnterpriseEnrollmentScreen();
   if (!enroll_screen) {
     AutomationJSONReply(this, reply_message).SendError(
         "Unable to access EnterpriseEnrollmentScreen");
     return;
   }
-  // Set up an observer (it will delete itself).
-  new EnrollmentObserver(this, reply_message, enroll_screen->GetActor(),
-                         enroll_screen);
-  enroll_screen->GetActor()->SubmitTestCredentials(user, password);
+  if (!automation_event_queue_.get())
+    automation_event_queue_.reset(new AutomationEventQueue);
+
+  int observer_id = automation_event_queue_->AddObserver(
+      new EnrollmentEventObserver(automation_event_queue_.get(),
+                                  enroll_screen->GetActor()));
+
+  // Return the observer's id.
+  DictionaryValue return_value;
+  return_value.SetInteger("observer_id", observer_id);
+  reply.SendSuccess(&return_value);
 }
 
 void TestingAutomationProvider::ExecuteJavascriptInOOBEWebUI(
     DictionaryValue* args, IPC::Message* reply_message) {
   std::string javascript, frame_xpath;
   if (!args->GetString("javascript", &javascript)) {
     AutomationJSONReply(this, reply_message)
         .SendError("'javascript' missing or invalid");
     return;
   }
@@ skipping 274 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }