Move logic in UserImageScreen from UserImageScreenHandler

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/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
@@ skipping 372 matching lines @@
     AutomationJSONReply(this, reply_message).SendError(
         "User image screen not active.");
     return;
   }
   chromeos::UserImageScreen* image_screen =
       wizard_controller->GetUserImageScreen();
   // Observer will delete itself unless error is returned.
   WizardControllerObserver* observer =
       new WizardControllerObserver(wizard_controller, this, reply_message);
   if (image_type == "profile") {
-    image_screen->OnProfileImageSelected();
+    image_screen->OnImageSelected("", image_type);

[Nikita (slow), 2013/04/17 20:28:04]

Why this call is changed?

[Denis Kuznetsov (DE-MUC), 2013/04/18 02:57:50]

Because screen does not have now separate methods for selecting
profile/camera/default image, it has one generic method.

[Denis Kuznetsov (DE-MUC), 2013/04/18 03:00:16]

And it should actually be followed by image_screen->OnImageAccepted() call.

   } else if (image_type.empty() && image_number >= 0 &&
              image_number < chromeos::kDefaultImagesCount) {
-    image_screen->OnDefaultImageSelected(image_number);
+    image_screen->OnImageSelected(
+        chromeos::GetDefaultImageUrl(image_number), image_type);
   } else {
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid or missing args.");
     delete observer;
     return;
   }
 }
 
 void TestingAutomationProvider::SkipToLogin(DictionaryValue* args,
                                             IPC::Message* reply_message) {
@@ skipping 930 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;
 }