Revert 195553 "Allow showing pending URL for new tab navigations..."

trunk/src/chrome/browser/ui/views/constrained_window_views_browsertest.cc

 // Copyright (c) 2012 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/memory/weak_ptr.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 292 matching lines @@
   ui_test_utils::NavigateToURL(browser(), new_tab_url);
   GURL about_url(chrome::kChromeUIAboutURL);
   ui_test_utils::NavigateToURL(browser(), about_url);
 
   ConstrainedWebDialogDelegate* cwdd = CreateConstrainedWebDialog(
       browser()->profile(),
       new ui::test::TestWebDialogDelegate(about_url),
       NULL,
       web_contents);
 
-  content::WindowedNotificationObserver back_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &web_contents->GetController()));
   content::RenderViewHost* render_view_host =
       cwdd->GetWebContents()->GetRenderViewHost();
   ForwardKeyEvent(render_view_host, ui::VKEY_BACK);
 
   // Backspace is not processed as accelerator before it's sent to web contents.
-  EXPECT_FALSE(web_contents->GetController().GetPendingEntry());
   EXPECT_EQ(about_url.spec(), web_contents->GetURL().spec());
 
+  content::RunAllPendingInMessageLoop();
+
   // Backspace is processed as accelerator after it's sent to web contents.
-  content::RunAllPendingInMessageLoop();
-  EXPECT_TRUE(web_contents->GetController().GetPendingEntry());
-
-  // Wait for the navigation to commit, since the URL will not be visible
-  // until then.
-  back_observer.Wait();
   EXPECT_EQ(new_tab_url.spec(), web_contents->GetURL().spec());
 }
 
 // Fails flakily (once per 10-20 runs) on Win Aura only. http://crbug.com/177482
 // Also fails on CrOS.
 #if defined(OS_WIN) || defined(OS_CHROMEOS)
 #define MAYBE_EscapeCloseConstrainedWindow DISABLED_EscapeCloseConstrainedWindow
 #else
 #define MAYBE_EscapeCloseConstrainedWindow EscapeCloseConstrainedWindow
 #endif
@@ skipping 24 matching lines @@
   // Escape is not processed as accelerator before it's sent to web contents.
   EXPECT_FALSE(observer.widget_closed());
 
   content::RunAllPendingInMessageLoop();
 
   // Escape is processed as accelerator after it's sent to web contents.
   EXPECT_TRUE(observer.widget_closed());
 }
 
 #endif  // defined(OS_WIN) || (defined(USE_AURA) && defined(USE_X11))