| Index: chrome/browser/ui/panels/old_panel_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/panels/old_panel_browsertest.cc (revision 147577)
|
| +++ chrome/browser/ui/panels/old_panel_browsertest.cc (working copy)
|
| @@ -367,7 +367,7 @@
|
|
|
| // Expand the test page.
|
| gfx::Rect initial_bounds = panel->GetBounds();
|
| - ui_test_utils::WindowedNotificationObserver enlarge(
|
| + content::WindowedNotificationObserver enlarge(
|
| chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
|
| content::Source<Panel>(panel));
|
| EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
|
| @@ -380,7 +380,7 @@
|
| EXPECT_EQ(bounds_on_grow.height(), initial_bounds.height());
|
|
|
| // Shrink the test page.
|
| - ui_test_utils::WindowedNotificationObserver shrink(
|
| + content::WindowedNotificationObserver shrink(
|
| chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
|
| content::Source<Panel>(panel));
|
| EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
|
| @@ -406,7 +406,7 @@
|
| EXPECT_EQ(new_bounds.size(), panel->GetRestoredBounds().size());
|
|
|
| // Turn back on auto-resize and verify that it works.
|
| - ui_test_utils::WindowedNotificationObserver auto_resize_enabled(
|
| + content::WindowedNotificationObserver auto_resize_enabled(
|
| chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
|
| content::Source<Panel>(panel));
|
| panel->SetAutoResizable(true);
|
| @@ -1260,7 +1260,7 @@
|
| Panel* panel2 = CreatePanelWithParams(params);
|
|
|
| // Close main tabbed window.
|
| - ui_test_utils::WindowedNotificationObserver signal(
|
| + content::WindowedNotificationObserver signal(
|
| chrome::NOTIFICATION_BROWSER_CLOSED,
|
| content::Source<Browser>(browser()));
|
| chrome::CloseWindow(browser());
|
| @@ -1337,10 +1337,10 @@
|
| web_app::GenerateApplicationNameFromExtensionId(extension_other->id());
|
| Panel* panel_other = CreatePanel(extension_app_name_other);
|
|
|
| - ui_test_utils::WindowedNotificationObserver signal(
|
| + content::WindowedNotificationObserver signal(
|
| chrome::NOTIFICATION_PANEL_CLOSED,
|
| content::Source<Panel>(panel));
|
| - ui_test_utils::WindowedNotificationObserver signal1(
|
| + content::WindowedNotificationObserver signal1(
|
| chrome::NOTIFICATION_PANEL_CLOSED,
|
| content::Source<Panel>(panel1));
|
|
|
| @@ -1400,7 +1400,7 @@
|
|
|
| // Close panel and respond to the onbeforeunload dialog with accept. This is
|
| // equivalent to clicking "Leave this page".
|
| - ui_test_utils::WindowedNotificationObserver signal(
|
| + content::WindowedNotificationObserver signal(
|
| chrome::NOTIFICATION_PANEL_CLOSED,
|
| content::Source<Panel>(panel));
|
| panel->Close();
|
| @@ -1453,7 +1453,7 @@
|
| int initial_height = panel->GetBounds().height();
|
|
|
| // Inject some HTML content into the panel.
|
| - ui_test_utils::WindowedNotificationObserver enlarge(
|
| + content::WindowedNotificationObserver enlarge(
|
| chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
|
| content::Source<Panel>(panel));
|
| EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
|
|
|