Revert 36888 - Refactored code to allow associating workers with multiple renderers.

SharedWorkers now gracefully handle http auth requests after their
initial window has closed.

BUG=27660
TEST=WorkerHttpAuth,SharedWorkerHttpAuth uitests

Review URL: http://codereview.chromium.org/509016

TBR=atwilson@chromium.org
Review URL: http://codereview.chromium.org/549138

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

1 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index dfea17c..03039b1 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -174,16 +174,18 @@ void NavigationNotificationObserver::Observe(
     // occur while authentication is ongoing.
     navigation_started_ = true;
   } else if (type == NotificationType::AUTH_NEEDED) {
-    // 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);
+    if (navigation_started_) {
+      // Remember the login handler that wants authentication.
+      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();
+    }
   } else {
     NOTREACHED();
   }