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

chrome/browser/sidebar/sidebar_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/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
@@ skipping 54 matching lines @@
     HideSidebar(browser()->GetSelectedTabContents());
   }
 
   void NavigateSidebarForCurrentTabTo(const std::string& test_page) {
     GURL url = test_server()->GetURL(test_page);
 
     TabContents* tab = browser()->GetSelectedTabContents();
 
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
 
-    ui_test_utils::WindowedNotificationObserver observer(
-        content::NOTIFICATION_LOAD_STOP,
-        Source<NavigationController>(&tab->controller()));
     sidebar_manager->NavigateSidebar(tab, content_id_, url);
-    observer.Wait();
+
+    SidebarContainer* sidebar_container =
+        sidebar_manager->GetSidebarContainerFor(tab, content_id_);
+
+    TabContents* client_contents = sidebar_container->sidebar_contents();
+    ui_test_utils::WaitForNavigation(&client_contents->controller());
   }
 
   void ShowSidebar(TabContents* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->ShowSidebar(tab, content_id_);
   }
 
   void ExpandSidebar(TabContents* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->ExpandSidebar(tab, content_id_);
@@ skipping 100 matching lines @@
   ASSERT_TRUE(test_server()->Start());
 
   ShowSidebarForCurrentTab();
 
   NavigateSidebarForCurrentTabTo(kSimplePage);
 
   HideSidebarForCurrentTab();
 }
 
 }  // namespace
+