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

chrome/browser/ui/panels/old_docked_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/message_loop.h"
 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/test/test_utils.h"
 
 class OldDockedPanelBrowserTest : public OldBasePanelBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
     OldBasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 screen area for the
     // primary monitor. Do the check now.
     gfx::Rect primary_screen_area = PanelManager::GetInstance()->
         display_settings_provider()->GetPrimaryScreenArea();
@@ skipping 162 matching lines @@
   int width_of_panel3_squeezed = panel3->GetBounds().width();
   panel3->Minimize();
 
   // Wait for any possible events.
   MessageLoopForUI::current()->RunAllPending();
 
   // Check that this panel is still at the same width.
   EXPECT_EQ(width_of_panel3_squeezed, panel3->GetBounds().width());
 
   // Minimize the active panel. It should become inactive and shrink in width.
-  ui_test_utils::WindowedNotificationObserver signal(
+  content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
       content::NotificationService::AllSources());
   panel7->Minimize();
 
   // Wait for active states to settle.
   WaitForPanelActiveState(panel7, SHOW_AS_INACTIVE);
 
   // Wait for the scheduled layout to run.
   signal.Wait();
 
@@ skipping 65 matching lines @@
   // Wait for all processing to finish.
   MessageLoopForUI::current()->RunAllPending();
 
   // We should not have squeezing any more; all panels should be at full width.
   EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_EQ(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }