New translate tests for pyauto.py

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2010 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/automation_provider.h"
 
 #include <set>
 
 #include "app/message_box_flags.h"
 #include "base/callback.h"
@@ skipping 2857 matching lines @@
 void AutomationProvider::WaitUntilTranslateComplete(
     Browser* browser, DictionaryValue* args, IPC::Message* reply_message) {
   std::string error_message;
   TabContents* tab_contents = GetTabContentsFromDict(browser, args,
                                                      &error_message);
   if (!tab_contents) {
     AutomationJSONReply(this, reply_message).SendError(error_message);
     return;
   }
 
+  TranslateInfoBarDelegate* translate_bar =
+      GetTranslateInfoBarDelegate(tab_contents);
+  scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+
+  if (!translate_bar) {
+    return_value->SetBoolean(L"translation_success", false);
+    AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
+    return;
+  }
+
   // If the translation is still pending, the observer will wait
   // for it to finish and then reply.
-  if (tab_contents->language_state().translation_pending()) {
+  if (translate_bar->type() == TranslateInfoBarDelegate::TRANSLATING) {
     new PageTranslatedObserver(this, reply_message, tab_contents);
     return;
   }
-  // Otherwise send back the success or failure of the attempted translation
-  // based on the translate bar state.
-  AutomationJSONReply reply(this, reply_message);
-  TranslateInfoBarDelegate* translate_bar =
-      GetTranslateInfoBarDelegate(tab_contents);
-  scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  if (!translate_bar) {
-    return_value->SetBoolean(L"translation_success", false);
-  } else {
-    return_value->SetBoolean(
-        L"translation_success",
-        translate_bar->type() == TranslateInfoBarDelegate::AFTER_TRANSLATE);
-  }
-  reply.SendSuccess(return_value.get());
+
+  // Otherwise send back the success or failure of the attempted translation.
+  return_value->SetBoolean(
+      L"translation_success",
+      translate_bar->type() == TranslateInfoBarDelegate::AFTER_TRANSLATE);
+  AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 // Sample json input: { "command": "GetThemeInfo" }
 // Refer GetThemeInfo() in chrome/test/pyautolib/pyauto.py for sample output.
 void AutomationProvider::GetThemeInfo(Browser* browser,
                                       DictionaryValue* args,
                                       IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   Extension* theme = browser->profile()->GetTheme();
   if (theme) {
@@ skipping 1577 matching lines @@
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)
 
 void AutomationProvider::ResetToDefaultTheme() {
   profile_->ClearTheme();
 }