Fix up various browser tests not to use WaitForNavigation.

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 2011 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 "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/dom_operation_notification_details.h"
@@ skipping 299 matching lines @@
   void SetInfobarResponse(const GURL& requesting_url, bool allowed) {
     TabContentsWrapper* tab_contents_wrapper =
         current_browser_->GetSelectedTabContentsWrapper();
     TabSpecificContentSettings* content_settings =
         tab_contents_wrapper->content_settings();
     const GeolocationSettingsState& settings_state =
         content_settings->geolocation_settings_state();
     size_t state_map_size = settings_state.state_map().size();
     ASSERT_TRUE(infobar_);
     LOG(WARNING) << "will set infobar response";
-    if (allowed)
-      infobar_->AsConfirmInfoBarDelegate()->Accept();
-    else
-      infobar_->AsConfirmInfoBarDelegate()->Cancel();
-    WaitForNavigation();
+    {
+      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();
+    }
+
     tab_contents_wrapper->RemoveInfoBar(infobar_);
     LOG(WARNING) << "infobar response set";
     infobar_ = NULL;
     EXPECT_GT(settings_state.state_map().size(), state_map_size);
     GURL requesting_origin = requesting_url.GetOrigin();
     EXPECT_EQ(1U, settings_state.state_map().count(requesting_origin));
     ContentSetting expected_setting =
           allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
     EXPECT_EQ(expected_setting,
               settings_state.state_map().find(requesting_origin)->second);
@@ skipping 314 matching lines @@
       "window.domAutomationController.setAutomationId(0);"
       "window.domAutomationController.send(window.close());";
   bool result =
       ui_test_utils::ExecuteJavaScript(
       current_browser_->GetSelectedTabContents()->render_view_host(),
       L"", UTF8ToWide(script));
   EXPECT_EQ(result, true);
 }
 
 }  // namespace