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

chrome/browser/ui/panels/panel_cocoa_unittest.mm

 // 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 <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/browser/ui/panels/panel.h"
 #import "chrome/browser/ui/panels/panel_cocoa.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 
 class PanelAnimatedBoundsObserver :
-    public ui_test_utils::WindowedNotificationObserver {
+    public content::WindowedNotificationObserver {
  public:
   PanelAnimatedBoundsObserver(Panel* panel)
-    : ui_test_utils::WindowedNotificationObserver(
+    : content::WindowedNotificationObserver(
         chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
         content::Source<Panel>(panel)) { }
   virtual ~PanelAnimatedBoundsObserver() { }
 };
 
 // Main test class.
 class PanelCocoaTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
@@ skipping 44 matching lines @@
     EXPECT_EQ(NSWidth(content_frame), NSWidth(titlebar_frame));
     EXPECT_EQ(NSHeight([[titlebar superview] bounds]), NSMaxY(titlebar_frame));
   }
 
   void ClosePanelAndWait(Panel* panel) {
     EXPECT_TRUE(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());
   }
 
   NSMenuItem* CreateMenuItem(NSMenu* menu, int command_id) {
     NSMenuItem* item =
@@ skipping 168 matching lines @@
 TEST_F(PanelCocoaTest, TitlebarViewClose) {
   Panel* panel = CreateTestPanel("Test Panel");
   PanelCocoa* native_window = static_cast<PanelCocoa*>(panel->native_panel());
 
   PanelTitlebarViewCocoa* titlebar = [native_window->controller_ titlebarView];
   EXPECT_TRUE(titlebar);
 
   PanelManager* manager = PanelManager::GetInstance();
   EXPECT_EQ(1, manager->num_panels());
   // Simulate clicking Close Button and wait until the Panel closes.
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CLOSED,
       content::Source<Panel>(panel));
   [titlebar simulateCloseButtonClick];
   signal.Wait();
   EXPECT_EQ(0, manager->num_panels());
 }
 
 // Verify some menu items being properly enabled/disabled for panels.
 TEST_F(PanelCocoaTest, MenuItems) {
   Panel* panel = CreateTestPanel("Test Panel");
@@ skipping 92 matching lines @@
   NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
   EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]);
 
   native_window2->ActivatePanel();
   frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
   EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]);
 
   ClosePanelAndWait(panel);
   ClosePanelAndWait(panel2);
 }