Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 10807047: Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_browsertest.cc
===================================================================
--- chrome/browser/ui/panels/panel_browsertest.cc (revision 147577)
+++ chrome/browser/ui/panels/panel_browsertest.cc (working copy)
@@ -374,7 +374,7 @@
// Expand the test page. The resize will update the docked panel strip.
gfx::Rect initial_bounds = panel->GetBounds();
- ui_test_utils::WindowedNotificationObserver enlarge(
+ content::WindowedNotificationObserver enlarge(
chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
content::NotificationService::AllSources());
EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
@@ -387,7 +387,7 @@
EXPECT_EQ(bounds_on_grow.height(), initial_bounds.height());
// Shrink the test page. The resize will update the docked panel strip.
- ui_test_utils::WindowedNotificationObserver shrink(
+ content::WindowedNotificationObserver shrink(
chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
content::NotificationService::AllSources());
EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
@@ -413,7 +413,7 @@
EXPECT_EQ(new_bounds.size(), panel->GetRestoredBounds().size());
// Turn back on auto-resize and verify that panel auto resizes.
- ui_test_utils::WindowedNotificationObserver auto_resize_enabled(
+ content::WindowedNotificationObserver auto_resize_enabled(
chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
content::NotificationService::AllSources());
panel->SetAutoResizable(true);
@@ -1338,7 +1338,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());
@@ -1408,10 +1408,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));
@@ -1497,7 +1497,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(
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm ('k') | chrome/browser/ui/panels/panel_cocoa_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698