Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

chrome/browser/ui/panels/old_panel_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/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 349 matching lines @@
   // Create a test panel with tab contents loaded.
   CreatePanelParams params("PanelTest1", gfx::Rect(), SHOW_AS_ACTIVE);
   GURL url(ui_test_utils::GetTestUrl(
       FilePath(kTestDir),
       FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
   params.url = url;
   Panel* panel = CreatePanelWithParams(params);
 
   // 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(
       panel->GetWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"changeSize(50);"));
   enlarge.Wait();
   gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
   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(
       panel->GetWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
   // Verify resizing turns off auto-resizing and that it works.
   gfx::Rect previous_bounds = panel->GetBounds();
   // These should be identical because the panel is expanded.
   EXPECT_EQ(previous_bounds.size(), panel->GetRestoredBounds().size());
   gfx::Size new_size(previous_bounds.size());
   new_size.Enlarge(5, 5);
   gfx::Rect new_bounds(previous_bounds.origin(), new_size);
   panel->SetBounds(new_bounds);
   EXPECT_FALSE(panel->auto_resizable());
   EXPECT_EQ(new_bounds.size(), panel->GetBounds().size());
   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);
   auto_resize_enabled.Wait();
   gfx::Rect bounds_auto_resize_enabled = panel->GetBounds();
   EXPECT_EQ(bounds_on_shrink.width(), bounds_auto_resize_enabled.width());
   EXPECT_EQ(bounds_on_shrink.height(), bounds_auto_resize_enabled.height());
 
   panel->Close();
 }
@@ skipping 833 matching lines @@
 
 // When there are 2 panels and no chrome window, minimizing one panel does
 // not expand/focuses another.
 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        MAYBE_MinimizeTwoPanelsWithoutTabbedWindow) {
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel1 = CreatePanelWithParams(params);
   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());
   signal.Wait();
 
   EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
   EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
   panel1->Activate();
   WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
 
@@ skipping 56 matching lines @@
   EXPECT_EQ(2, panel_manager->num_panels());
 
   // Create another extension and a panel from that extension.
   scoped_refptr<Extension> extension_other =
       CreateExtension(FILE_PATH_LITERAL("TestExtensionOther"),
       Extension::INVALID, empty_value);
   std::string extension_app_name_other =
       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));
 
   // Send unload notification on the first extension.
   extensions::UnloadedExtensionInfo details(extension,
                                 extension_misc::UNLOAD_REASON_UNINSTALL);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(browser()->profile()),
       content::Details<extensions::UnloadedExtensionInfo>(&details));
@@ skipping 39 matching lines @@
   title_watcher.reset(
       new ui_test_utils::TitleWatcher(web_contents, title_second_close));
   panel->Close();
   alert = ui_test_utils::WaitForAppModalDialog();
   alert->native_dialog()->CloseAppModalDialog();
   EXPECT_EQ(title_second_close, title_watcher->WaitAndGetTitle());
   EXPECT_EQ(1, panel_manager->num_panels());
 
   // 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();
   alert = ui_test_utils::WaitForAppModalDialog();
   alert->native_dialog()->AcceptAppModalDialog();
   signal.Wait();
   EXPECT_EQ(0, panel_manager->num_panels());
 }
 
 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, SizeClamping) {
@@ skipping 32 matching lines @@
   PanelManager::GetInstance()->enable_auto_sizing(true);
   // Using 0 sizes triggers auto-sizing.
   CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE);
   params.url = GURL("data:text/html;charset=utf-8,<!doctype html><body>");
   Panel* panel = CreatePanelWithParams(params);
 
   int initial_width = panel->GetBounds().width();
   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(
       panel->GetWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"document.body.innerHTML ="
       L"'<nobr>line of text and a <button>Button</button>';"));
   enlarge.Wait();
 
   // The panel should have become larger in both dimensions (the minimums
@@ skipping 58 matching lines @@
   EXPECT_GE(smaller_work_area_size.width(), panel->max_size().width());
   EXPECT_EQ(smaller_work_area_size.height(), panel->max_size().height());
   EXPECT_GT(old_full_size.width(), panel->full_size().width());
   EXPECT_GT(old_full_size.height(), panel->full_size().height());
   EXPECT_GE(panel->max_size().width(), panel->full_size().width());
   EXPECT_GE(panel->max_size().height(), panel->full_size().height());
   EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height());
 
   panel->Close();
 }