Revert 96593 - Fix up various browser tests not to use WaitForNavigation.

chrome/browser/geolocation/geolocation_browsertest.cc

Index: chrome/browser/geolocation/geolocation_browsertest.cc
===================================================================
--- chrome/browser/geolocation/geolocation_browsertest.cc	(revision 96616)
+++ chrome/browser/geolocation/geolocation_browsertest.cc	(working copy)
@@ -317,17 +317,11 @@
     size_t state_map_size = settings_state.state_map().size();
     ASSERT_TRUE(infobar_);
     LOG(WARNING) << "will set infobar response";
-    {
-      ui_test_utils::WindowedNotificationObserver observer(
-          content::NOTIFICATION_LOAD_STOP,
-          Source<NavigationController>(&tab_contents_wrapper->controller()));
-      if (allowed)
-        infobar_->AsConfirmInfoBarDelegate()->Accept();
-      else
-        infobar_->AsConfirmInfoBarDelegate()->Cancel();
-      observer.Wait();
-    }
-
+    if (allowed)
+      infobar_->AsConfirmInfoBarDelegate()->Accept();
+    else
+      infobar_->AsConfirmInfoBarDelegate()->Cancel();
+    WaitForNavigation();
     tab_contents_wrapper->RemoveInfoBar(infobar_);
     LOG(WARNING) << "infobar response set";
     infobar_ = NULL;