Clean up Chrome OS Enterprise Enrollment UI code.

Move the controller bits into EnterpriseEnrollmentScreen, consolidate
UMA there. Clean up error reporting in preparation for wiring enrollment
with the new-style cloud policy stack.

BUG=chromium:108928
TEST=Chrome OS Enterprise (Auto-)Enrollment still works.
R=joaodasilva@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11189119

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165371 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 18 deletions

diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index ae2b220..6bc2e6b 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -26,7 +26,6 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
-#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -940,19 +939,16 @@ class VirtualConnectObserver
 // Waits for enterprise device enrollment to complete and returns the status to
 // the automation provider.
 class EnrollmentObserver
-    : public chromeos::EnterpriseEnrollmentScreenActor::Observer {
+    : public chromeos::EnterpriseEnrollmentScreen::TestingObserver {
  public:
   EnrollmentObserver(AutomationProvider* automation,
-      IPC::Message* reply_message,
-      chromeos::EnterpriseEnrollmentScreenActor* enrollment_screen_actor,
-      chromeos::EnterpriseEnrollmentScreen* enrollment_screen);
+                     IPC::Message* reply_message,
+                     chromeos::EnterpriseEnrollmentScreen* enrollment_screen);
 
   virtual ~EnrollmentObserver();
 
-  // chromeos::EnterpriseEnrollmentScreenActor::Observer implementation.
-  virtual void OnEnrollmentComplete(
-      chromeos::EnterpriseEnrollmentScreenActor* enrollment_screen_actor,
-      bool succeeded);
+  // chromeos::EnterpriseEnrollmentScreen::Observer implementation.
+  virtual void OnEnrollmentComplete(bool succeeded);
 
  private:
   base::WeakPtr<AutomationProvider> automation_;
diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index fb9c87a..02f036f 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -425,20 +425,17 @@ chromeos::VirtualNetwork* VirtualConnectObserver::GetVirtualNetwork(
 
 EnrollmentObserver::EnrollmentObserver(AutomationProvider* automation,
     IPC::Message* reply_message,
-    chromeos::EnterpriseEnrollmentScreenActor* enrollment_screen_actor,
     chromeos::EnterpriseEnrollmentScreen* enrollment_screen)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       enrollment_screen_(enrollment_screen) {
-  enrollment_screen_actor->AddObserver(this);
+  enrollment_screen_->AddTestingObserver(this);
 }
 
 EnrollmentObserver::~EnrollmentObserver() {}
 
-void EnrollmentObserver::OnEnrollmentComplete(
-    chromeos::EnterpriseEnrollmentScreenActor* enrollment_screen_actor,
-    bool succeeded) {
-  enrollment_screen_actor->RemoveObserver(this);
+void EnrollmentObserver::OnEnrollmentComplete(bool succeeded) {
+  enrollment_screen_->RemoveTestingObserver(this);
   if (automation_) {
     if (succeeded) {
       AutomationJSONReply(automation_,
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 1b8eeca..087b1fe 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -34,8 +34,8 @@
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
-#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
@@ -1220,8 +1220,7 @@ void TestingAutomationProvider::EnrollEnterpriseDevice(
     return;
   }
   // Set up an observer (it will delete itself).
-  new EnrollmentObserver(this, reply_message, enroll_screen->GetActor(),
-                         enroll_screen);
+  new EnrollmentObserver(this, reply_message, enroll_screen);
   enroll_screen->GetActor()->SubmitTestCredentials(user, password);
 }