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 198 matching lines @@
       policy::PolicyMap::const_iterator i;
       for (i = policy_map->begin(); i != policy_map->end(); i++) {
         if (i->second.level == policy_level)
           dict->Set(i->first, i->second.value->DeepCopy());
       }
     }
   }
   return dict;
 }
 
+// Returns the EnterpriseEnrollmentScreen, if it exists.
+chromeos::EnterpriseEnrollmentScreen* GetEnterpriseEnrollmentScreen() {
+  chromeos::WizardController* wizard_controller =
+      chromeos::WizardController::default_controller();
+  if (!wizard_controller)
+    return NULL;
+  return wizard_controller->GetEnterpriseEnrollmentScreen();
+}
+
 // Last reported power status.
 chromeos::PowerSupplyStatus global_power_status;
 
 }  // namespace
 
 class PowerManagerClientObserverForTesting
     : public chromeos::PowerManagerClient::Observer {
  public:
   virtual ~PowerManagerClientObserverForTesting() {}
 
@@ skipping 688 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) {
-    AutomationJSONReply(this, reply_message).SendError(
-        "Unable to access WizardController");
+  chromeos::EnterpriseEnrollmentScreen* enroll_screen =
+      GetEnterpriseEnrollmentScreen();
+  if (!enroll_screen) {
+    reply.SendError("Unable to access EnterpriseEnrollmentScreen");
     return;
   }
+  enroll_screen->GetActor()->Show();
+  reply.SendSuccess(NULL);
+}
+
+void TestingAutomationProvider::AddEnrollmentObserver(
+    DictionaryValue* args, IPC::Message* reply_message) {
+  AutomationJSONReply reply(this, reply_message);
   chromeos::EnterpriseEnrollmentScreen* enroll_screen =
-      wizard_controller->GetEnterpriseEnrollmentScreen();
+      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;
 }