[cros] pyauto.CancelOOBEUpdate always returns a non-empty dict with 'next_screen'.

BUG=None
TEST=chromeos_oobe.py


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

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

chrome/browser/automation/testing_automation_provider.h

@@ -1441,7 +1441,6 @@ class TestingAutomationProvider : public AutomationProvider,
   // Example:
   //    input: none
   //    output: { "next_screen": "login" }
-  //    output: none (if update was not running)
   void CancelOOBEUpdate(base::DictionaryValue* args,
                         IPC::Message* reply_message);
 

chrome/browser/automation/testing_automation_provider_chromeos.cc

@@ -284,7 +284,11 @@ void TestingAutomationProvider::CancelOOBEUpdate(DictionaryValue* args,
                                                  IPC::Message* reply_message) {
   WizardController* wizard_controller = WizardController::default_controller();
   if (wizard_controller && wizard_controller->IsOobeCompleted()) {
-    AutomationJSONReply(this, reply_message).SendSuccess(NULL);
+    // Update already finished.
+    scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+    return_value->SetString("next_screen",
+                            WizardController::kLoginScreenName);
+    AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
     return;
   }
   if (!wizard_controller || wizard_controller->current_screen()->GetName() !=