TestOverrideEncoding hanging is because TabProxy::WaitForNavigation can not g...

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2009 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/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 1328 matching lines @@
     NavigationController* controller = tab_tracker_->GetResource(tab_handle);
     int index;
     Browser* browser = Browser::GetBrowserForController(controller, &index);
     DCHECK(browser);
     new TabClosedNotificationObserver(this, wait_until_closed, reply_message);
     browser->CloseContents(controller->tab_contents());
     return;
   }
 
   AutomationMsg_CloseTab::WriteReplyParams(reply_message, false);
+  Send(reply_message);
 }
 
 void AutomationProvider::CloseBrowser(int browser_handle,
                                       IPC::Message* reply_message) {
   if (browser_tracker_->ContainsHandle(browser_handle)) {
     Browser* browser = browser_tracker_->GetResource(browser_handle);
     new BrowserClosedNotificationObserver(browser, this,
                                           reply_message);
     browser->window()->Close();
   } else {
@@ skipping 381 matching lines @@
         }
         InfoBarDelegate* delegate =
             nav_controller->tab_contents()->GetInfoBarDelegateAt(
                 info_bar_index);
         if (delegate->AsConfirmInfoBarDelegate())
           delegate->AsConfirmInfoBarDelegate()->Accept();
         success = true;
       }
     }
   }
+
+  // This "!wait_for_navigation || !success condition" logic looks suspicious.
+  // It will send a failure message when success is true but
+  // |wait_for_navigation| is false.
+  // TODO(phajdan.jr): investgate whether the reply param (currently
+  // AUTOMATION_MSG_NAVIGATION_ERROR) should depend on success.
   if (!wait_for_navigation || !success)
     AutomationMsg_ClickSSLInfoBarLink::WriteReplyParams(
         reply_message, AUTOMATION_MSG_NAVIGATION_ERROR);
 }
 
 void AutomationProvider::GetLastNavigationTime(int handle,
                                                int64* last_navigation_time) {
   Time time = tab_tracker_->GetLastNavigationTime(handle);
   *last_navigation_time = time.ToInternalValue();
 }
 
 void AutomationProvider::WaitForNavigation(int handle,
                                            int64 last_navigation_time,
                                            IPC::Message* reply_message) {
   NavigationController* controller = tab_tracker_->GetResource(handle);
   Time time = tab_tracker_->GetLastNavigationTime(handle);
 
   if (time.ToInternalValue() > last_navigation_time || !controller) {
     AutomationMsg_WaitForNavigation::WriteReplyParams(reply_message,
         controller == NULL ? AUTOMATION_MSG_NAVIGATION_ERROR :
                              AUTOMATION_MSG_NAVIGATION_SUCCESS);
+    Send(reply_message);
     return;
   }
 
   AddNavigationStatusListener(controller, reply_message, 1);
 }
 
 void AutomationProvider::SetIntPreference(int handle,
                                           const std::wstring& name,
                                           int value,
                                           bool* success) {
@@ skipping 272 matching lines @@
   for (;iter != BrowserList::end(); ++iter) {
     gfx::NativeWindow this_window = (*iter)->window()->GetNativeHandle();
     if (window == this_window) {
       // Add() returns the existing handle for the resource if any.
       *browser_handle = browser_tracker_->Add(*iter);
       *success = true;
       return;
     }
   }
 }