Refactored code to allow associating workers with multiple renderers.

chrome/browser/automation/automation_provider_observers.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_observers.h"
 
 #include "base/basictypes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/dom_operation_notification_details.h"
@@ skipping 156 matching lines @@
         ConditionMet(AUTOMATION_MSG_NAVIGATION_SUCCESS);
     }
   } else if (type == NotificationType::AUTH_SUPPLIED) {
     // The LoginHandler for this tab is no longer valid.
     automation_->RemoveLoginHandler(controller_);
 
     // Treat this as if navigation started again, since load start/stop don't
     // occur while authentication is ongoing.
     navigation_started_ = true;
   } else if (type == NotificationType::AUTH_NEEDED) {
-    if (navigation_started_) {
-      // Remember the login handler that wants authentication.
-      LoginHandler* handler =
-          Details<LoginNotificationDetails>(details)->handler();
-      automation_->AddLoginHandler(controller_, handler);
+    // Remember the login handler that wants authentication.
+    // We do this in all cases (not just when navigation_started_ == true) so
+    // tests can still wait for auth dialogs outside of navigation.
+    LoginHandler* handler =
+        Details<LoginNotificationDetails>(details)->handler();
+    automation_->AddLoginHandler(controller_, handler);
 
-      // Respond that authentication is needed.
-      navigation_started_ = false;
-      ConditionMet(AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED);
-    } else {
-      NOTREACHED();
-    }
+    // Respond that authentication is needed.
+    navigation_started_ = false;
+    ConditionMet(AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED);
   } else {
     NOTREACHED();
   }
 }
 
 void NavigationNotificationObserver::ConditionMet(
     AutomationMsg_NavigationResponseValues navigation_result) {
   DCHECK(reply_message_ != NULL);
 
   IPC::ParamTraits<AutomationMsg_NavigationResponseValues>::Write(
@@ skipping 506 matching lines @@
     const NotificationSource& source, const NotificationDetails& details) {
   if (type != NotificationType::METRIC_EVENT_DURATION) {
     NOTREACHED();
     return;
   }
   MetricEventDurationDetails* metric_event_duration =
       Details<MetricEventDurationDetails>(details).ptr();
   durations_[metric_event_duration->event_name] =
       metric_event_duration->duration_ms;
 }