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

chrome/browser/ui/panels/old_base_panel_browser_test.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 "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 237 matching lines @@
     Panel* panel, ActiveState expected_state) {
   DCHECK(expected_state == SHOW_AS_ACTIVE ||
          expected_state == SHOW_AS_INACTIVE);
   PanelActiveStateObserver signal(panel, expected_state == SHOW_AS_ACTIVE);
   signal.Wait();
 }
 
 void OldBasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_WINDOW_SIZE_KNOWN,
       content::Source<Panel>(panel));
   if (panel_testing->IsWindowSizeKnown())
     return;
   signal.Wait();
   EXPECT_TRUE(panel_testing->IsWindowSizeKnown());
 }
 
 void OldBasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel));
   if (!panel_testing->IsAnimatingBounds())
     return;
   signal.Wait();
   EXPECT_TRUE(!panel_testing->IsAnimatingBounds());
 }
 
 void OldBasePanelBrowserTest::WaitForExpansionStateChanged(
     Panel* panel, Panel::ExpansionState expansion_state) {
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
       content::Source<Panel>(panel));
   if (panel->expansion_state() == expansion_state)
     return;
   signal.Wait();
   EXPECT_EQ(expansion_state, panel->expansion_state());
 }
 
 Panel* OldBasePanelBrowserTest::CreatePanelWithParams(
     const CreatePanelParams& params) {
 #if defined(OS_MACOSX)
   // Opening panels on a Mac causes NSWindowController of the Panel window
   // to be autoreleased. We need a pool drained after it's done so the test
   // can close correctly. The NSWindowController of the Panel window controls
   // lifetime of the Browser object so we want to release it as soon as
   // possible. In real Chrome, this is done by message pump.
   // On non-Mac platform, this is an empty class.
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
 
   Browser* panel_browser = Browser::CreateWithParams(
       Browser::CreateParams::CreateForApp(
           Browser::TYPE_PANEL, params.name, params.bounds,
           browser()->profile()));
   EXPECT_TRUE(panel_browser->is_type_panel());
 
   if (!params.url.is_empty()) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(panel_browser, params.url,
                                   content::PAGE_TRANSITION_START_PAGE);
     observer.Wait();
   }
 
   PanelBrowserWindow* panel_browser_window =
       static_cast<PanelBrowserWindow*>(panel_browser->window());
   Panel* panel = panel_browser_window->panel();
@@ skipping 120 matching lines @@
   mock_display_settings_provider_->SetPrimaryScreenArea(primary_screen_area);
   mock_display_settings_provider_->SetWorkArea(
       work_area.IsEmpty() ? primary_screen_area : work_area);
 }
 
 void OldBasePanelBrowserTest::CloseWindowAndWait(Panel* panel) {
   // Closing a panel may involve several async tasks. Need to use
   // message pump and wait for the notification.
   PanelManager* manager = PanelManager::GetInstance();
   int panel_count = manager->num_panels();
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CLOSED,
       content::Source<Panel>(panel));
   panel->Close();
   signal.Wait();
   // Now we have one less panel.
   EXPECT_EQ(panel_count - 1, manager->num_panels());
 
 #if defined(OS_MACOSX)
   // Mac window controllers may be autoreleased, and in the non-test
   // environment, may actually depend on the autorelease pool being recycled
   // with the run loop in order to perform important work. Replicate this in
   // the test environment.
   AutoreleasePool()->Recycle();
 
   // Make sure that everything has a chance to run.
   chrome::testing::NSRunLoopRunAllPending();
 #endif  // OS_MACOSX
 }
 
 void OldBasePanelBrowserTest::MoveMouseAndWaitForExpansionStateChange(
     Panel* panel,
     const gfx::Point& position) {
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
       content::Source<Panel>(panel));
   MoveMouse(position);
   signal.Wait();
 }
 
 void OldBasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string OldBasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }